OSDN Git Service

(root) / android-x86 / system-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e203263 cbd82ed)
resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43c...
authorNarayan Kamath <narayan@google.com>
Wed, 21 Sep 2016 18:04:55 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 18:04:55 +0000 (18:04 +0000)
am: cbd82ed9e7

Change-Id: I3da73dab66ef3b61e0560a6423092746f65a5fc4


Trivial merge
system/core
About OSDN
Find Software
Develop Software
Help