OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92573f1 064d252)
am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:23:22 +0000 (15:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Dec 2012 23:23:22 +0000 (15:23 -0800)
* commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':


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