OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8d45a7 a8399c8)
Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1
authorScott Main <smain@google.com>
Thu, 27 Oct 2011 21:43:50 +0000 (14:43 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Oct 2011 21:43:50 +0000 (14:43 -0700)

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