OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1caa12f b3d1805)
am bc7f0763: merge -s ours 21b0919f to lmp-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 17 Jul 2014 18:23:55 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:23:55 +0000 (18:23 +0000)
* commit 'bc7f0763466dd42c355f6e1a2d7e23396cc10994':


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