OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aac54b5 152ecbc)
Merge "resolved conflicts for merge of 6a828712 to master"
authorAdam Powell <adamp@google.com>
Wed, 7 Dec 2011 00:57:35 +0000 (16:57 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Dec 2011 00:57:35 +0000 (16:57 -0800)

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