OSDN Git Service

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


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