Merge changes from topic "p-renderpass2" into pie-cts-dev
authorJohn Anthony <john.anthony@arm.com>
Tue, 4 Sep 2018 23:53:46 +0000 (16:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Sep 2018 23:53:46 +0000 (16:53 -0700)
am: 79749eabc6

Change-Id: I0ddba5851971235127ae29b7047ef095ee6b2b16


Trivial merge