OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a7cec b34b504)
Merge "Fix merge conflict for 'c506ab89'" into honeycomb-plus-aosp
authorDan Morrill <morrildl@google.com>
Thu, 13 Jan 2011 20:21:07 +0000 (12:21 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Jan 2011 20:21:07 +0000 (12:21 -0800)

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