OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d780ae 3fc1f85)
Merge "resolved conflicts for merge of 7e2181c0 to master"
authorsatok <satok@google.com>
Fri, 3 Jun 2011 01:28:58 +0000 (18:28 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Jun 2011 01:28:58 +0000 (18:28 -0700)

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