OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f734be1 811da21)
am 811da214: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:18:38 +0000 (07:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Aug 2012 14:18:38 +0000 (07:18 -0700)
* commit '811da2144eae98d9e92c4f594be9f1ce36398f80':


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