OSDN Git Service

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0d...
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)
commit0777ad8253ef0423c19874a31c8c43ca82f55314
treeaf858ad3db5ae254435d009153b7a8e98fe9e91b
parent3aaac55e70de465c95c2950c2a3a892027c54719
parentd610363a48dee51fb5a624761cf4aa1ab0edde42
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
am: d610363a48

Change-Id: I186b4bedcf057489deca1e161a052619ce594e56