OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4e05c3 5ea8834)
Merge "resolved conflicts for merge of e2aa0490 to master"
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 01:00:12 +0000 (18:00 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 10 Jun 2011 01:00:13 +0000 (18:00 -0700)

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