OSDN Git Service

Merge changes from topic 'lshal' am: c9bc03729b am: d99d31d5d3
authorYifan Hong <elsk@google.com>
Mon, 13 Feb 2017 19:43:23 +0000 (19:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Feb 2017 19:43:23 +0000 (19:43 +0000)
am: 5581e229a6

Change-Id: I526b604879c5c5103a7d0f9a66471534383c6175


Trivial merge