OSDN Git Service

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

Change-Id: If32d7c1459710e4f584be7740e8de785337dd54b


Trivial merge