OSDN Git Service

Merge changes from topic 'test-hwc2' am: 29943c1971 am: 92360b14a0
authorMarissa Wall <marissaw@google.com>
Mon, 13 Mar 2017 18:06:39 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Mar 2017 18:06:39 +0000 (18:06 +0000)
am: d47b3c13da

Change-Id: I616fe5646001c45933d466ee77824dc435819c5b


Trivial merge