OSDN Git Service

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

Change-Id: Iffd43a310f576488aee8b34123b738cf9adfb05e


Trivial merge