OSDN Git Service

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

Change-Id: Id8f5b24bdf8fc141f42a2fb357767b45138591e4