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)
commit12e0186aa14a3b230ba380380cd1c86cb2a2ff4d
treef67d13e5564615347fec8baec709cc1745dc1151
parentff3f6e29e75ea55a8b0f6d9c794d7700097448df
parent9e63540d015ba0a2d6f3c8c3f3090e3cfd13fd2c
Merge changes Iee17fa80,Id9ee50be into lmp-dev
am: 9e63540d01

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33