OSDN Git Service

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


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