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

Change-Id: I00f9fdd4bfb60e3fa3c0afd6e7346ade80da45cf


Trivial merge