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

Change-Id: Ic4efd9ca2493f4205c2724c1a8c49dc4b7c60197


Trivial merge