Merge "Fix image layout in pipeline barrier tests" am: f61183a55c am: a42dcee85a...
authorMika Isojärvi <misojarvi@google.com>
Tue, 22 Aug 2017 17:30:05 +0000 (17:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:30:05 +0000 (17:30 +0000)
am: 07fcfcaa7f

Change-Id: Ibe6cb65f6eb7a1d52f0a2b192c88082f49f93847


Trivial merge