OSDN Git Service

Merge changes from topic 'lshal' am: 1f2d5a9cda am: 65b5fab397 am: cf41d3fa69
authorYifan Hong <elsk@google.com>
Thu, 26 Jan 2017 18:33:58 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 18:33:58 +0000 (18:33 +0000)
am: 86e0f74b09

Change-Id: I410c1ad96a56905bd146f0730a3497458ab54e3b


Trivial merge