OSDN Git Service

Merge changes from topic 'aware_hal_updates' am: 33b3f09576
authorEtan Cohen <etancohen@google.com>
Tue, 13 Dec 2016 15:13:49 +0000 (15:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 15:13:49 +0000 (15:13 +0000)
am: 1d8b72d050

Change-Id: Icaf27482b02f03505166036d3b058d566e1c3e4d


Trivial merge