OSDN Git Service

Merge changes from topic 'lshal_32'
authorYifan Hong <elsk@google.com>
Fri, 3 Mar 2017 17:53:30 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Mar 2017 17:53:30 +0000 (17:53 +0000)
am: 2eaf6b8eae

Change-Id: Id18cdd5d27d2624c7ae0f7a60b178d5bf1c71c05


Trivial merge