OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc2861f ae36741)
Merge "resolved conflicts for merge of e4a56a32 to master"
authorWink Saville <wink@google.com>
Sat, 9 Jul 2011 00:48:37 +0000 (17:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 9 Jul 2011 00:48:37 +0000 (17:48 -0700)

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