OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97fffa1 1a5746d)
am 32f17ee4: am 288cde7f: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 21 Jan 2012 00:40:50 +0000 (16:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 21 Jan 2012 00:40:50 +0000 (16:40 -0800)
* commit '32f17ee4b77adb937a04265201f589f2073af510':


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