OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62e5463 b0127aa)
am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1...
authorNaveen Leekha <leekha@google.com>
Thu, 24 Sep 2015 23:44:56 +0000 (23:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 23:44:56 +0000 (23:44 +0000)
* commit 'b0127aadafbf3b314475e48772fdcc17939c5a9c':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help