Merge "Fix allocator in WSI swapchain render test am: f31905d3c4 am: 99290ba6e7"...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 12 May 2016 14:57:14 +0000 (14:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 May 2016 14:57:14 +0000 (14:57 +0000)

Trivial merge