OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11b5325 4dffae1)
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
authorGilles Debunne <debunne@google.com>
Thu, 10 Feb 2011 22:43:35 +0000 (14:43 -0800)
committerGilles Debunne <debunne@google.com>
Thu, 10 Feb 2011 22:43:35 +0000 (14:43 -0800)
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b


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