OSDN Git Service

Merge changes from topic 'lshal_debug' into oc-dev
authorYifan Hong <elsk@google.com>
Tue, 16 May 2017 16:12:56 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 16:12:56 +0000 (16:12 +0000)
am: 47c1875e35  -s ours

Change-Id: I66ecb116b5f601b08982ca82ab8aeda7e2c8a22e


Trivial merge