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

Change-Id: I7d50032a9f08023eeec243a314ea0328dde0aa8a


Trivial merge