OSDN Git Service

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am:...
authorAdam Seaton <aseaton@google.com>
Wed, 12 Apr 2017 23:29:53 +0000 (23:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 23:29:53 +0000 (23:29 +0000)
am: d236029c61

Change-Id: I229eadd885c5a292ef0f7536b15d950251fdd3bb


Trivial merge