OSDN Git Service

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


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