OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbe9cb4 c59c6da)
Merge "resolved conflicts for merge of af75fdb1 to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 17:17:26 +0000 (10:17 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jul 2011 17:17:26 +0000 (10:17 -0700)

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