OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2151c41 5a438f5)
am 5a438f52: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:55:38 +0000 (08:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 15:55:38 +0000 (08:55 -0700)
* commit '5a438f523596236d6a620b08ea14d83c25418430':


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