OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29a0fb1 52d55d8)
am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform...
authorScott Main <smain@google.com>
Mon, 6 Feb 2012 21:09:08 +0000 (13:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 21:09:08 +0000 (13:09 -0800)
* commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':


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