OSDN Git Service

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

Change-Id: Idf28d646ca10ff2724c213828c8f095dc4587f5a


Trivial merge