OSDN Git Service

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

Change-Id: I222d3eb23b358ff2dda442027eeb3e7944b027d9


Trivial merge