OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7856e7e e418eaa)
Merge "resolved conflicts for merge of 76450622 to master"
authorDianne Hackborn <hackbod@google.com>
Thu, 2 Jun 2011 17:17:05 +0000 (10:17 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Jun 2011 17:17:05 +0000 (10:17 -0700)

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