tree b3802624fbbeb58e119fe3ab86b9df9403819c80
parent 3049198484c2ec33a14789976eb08f898a97ba21
parent 29943c197182e7c48997dd974a22662fedea9bec
author Marissa Wall <marissaw@google.com> 1489427912 +0000
committer android-build-merger <android-build-merger@google.com> 1489427912 +0000

Merge changes from topic 'test-hwc2'
am: 29943c1971

Change-Id: I69fdf5bf2ff8f2c454e2e1a455e4d8d73b330aa3