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:05:30 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 17:05:30 +0000 (17:05 +0000)
commit511cbadc98f69234676cc7be092fd00a1e9bb31a
tree4783d31fd627ae6625b21f92840d4cb9c6e4d30f
parent75dd199ec4bfcd4f09fcc1196f98cd5e8c3b9799
parent4390796eeb9d4b9ccf958c0be6e5445f71183bef
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85
am: 4390796eeb

Change-Id: If65018427bcdce6e6faec5c42f53d1ae9e99cc28