Merge "Fix image layout in pipeline barrier tests"
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 2 Aug 2016 23:02:21 +0000 (23:02 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 2 Aug 2016 23:02:21 +0000 (23:02 +0000)

Trivial merge