OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41499c0 3476cbb)
resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 11 Aug 2010 18:51:31 +0000 (11:51 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 11 Aug 2010 18:51:31 +0000 (11:51 -0700)
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5


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