OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e97fe4 3e97393)
Merge "resolved conflicts for merge of 12e08f3a to master"
authorAdam Powell <adamp@google.com>
Sun, 12 Sep 2010 20:14:16 +0000 (13:14 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 12 Sep 2010 20:14:16 +0000 (13:14 -0700)

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