OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 754e380 69e7ff3)
am 69e7ff3a: am cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 21:58:50 +0000 (21:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Apr 2014 21:58:50 +0000 (21:58 +0000)
* commit '69e7ff3a0c656041bff2fdd8b7190d3ee7d30a8c':
  Fix incorrect merge conflict to klp-modular-dev-plus-aosp


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