Merge "Fix allocator in WSI swapchain render test am: f31905d3c4 am: 99290ba6e7"...
authorPyry Haulos <phaulos@google.com>
Thu, 12 May 2016 14:59:56 +0000 (14:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 14:59:56 +0000 (14:59 +0000)
am: 316410640a

* commit '316410640a475162b8d21b08570a3f82b0e7505e':

Change-Id: I5e570a5ed406ccdbe54c07d70c91152404c44a10


Trivial merge