Merge "Merge changes from topic \'vulkan-mem-limits\' into nyc-dev am: a7756de am...
authorPyry Haulos <phaulos@google.com>
Fri, 22 Apr 2016 22:08:31 +0000 (22:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 22:08:31 +0000 (22:08 +0000)
am: dbf3773

* commit 'dbf3773a5bdfe8a8687acb414223c97f33f24f83':

Change-Id: Icfd44c1f6a5dfd5acfc077fda0830648fd4b21c3


Trivial merge