OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bc19dc 9fa048b)
Merge "resolved conflicts for merge of e95c07bd to master"
authorDianne Hackborn <hackbod@google.com>
Wed, 15 Jun 2011 03:41:27 +0000 (20:41 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Jun 2011 03:41:27 +0000 (20:41 -0700)

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