Merge "Fix image layout in pipeline barrier tests" am: f61183a55c am: a42dcee85a...
authorMika Isojärvi <misojarvi@google.com>
Tue, 2 Aug 2016 23:19:41 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 23:19:41 +0000 (23:19 +0000)
am: 417bb5b04a

Change-Id: Id1c4c22e9b72eacf82bc21afaadb55e479139050


Trivial merge