OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f99721 ca5aae2)
am ca5aae24: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:59:16 +0000 (05:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 12:59:16 +0000 (05:59 -0700)
* commit 'ca5aae2425a88ddc0bdf7f03569848fd67e603d2':


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