OSDN Git Service

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
authorLajos Molnar <lajos@google.com>
Fri, 9 Sep 2016 16:54:43 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 16:54:43 +0000 (16:54 +0000)
commit4e3aea6a854c05686ef2072201e016c3007505fc
tree6759d4221bd6976048f8f281c6f864c2387a03e7
parentda3cba194bff674f5a3f4b0249a651b00ab00c37
parent7c36c95b19a98a17cc1f132f4818142b3969272d
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
am: 7c36c95b19

Change-Id: I6b2c80df71e7b131ada618141db3cdec37d9e587