OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e1e53e 0c6fff7)
am 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:57:07 +0000 (11:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Dec 2012 19:57:07 +0000 (11:57 -0800)
* commit '0c6fff72f78e4f80b28ccccac9584255591dd1a2':


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