OSDN Git Service

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85...
authorLajos Molnar <lajos@google.com>
Fri, 9 Sep 2016 17:11:33 +0000 (17:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 17:11:33 +0000 (17:11 +0000)
am: b5ae909c74

Change-Id: I2a34e07a5e122991d00d28163ed606ef89839eed


Trivial merge