OSDN Git Service

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

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33


Trivial merge