OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc11171 2286e13)
am e761f1e5: am 17c01198: am 31b0c687: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 10:42:17 +0000 (02:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 10:42:17 +0000 (02:42 -0800)
* commit 'e761f1e58f3946b01f9715e145b402db16f81367':


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