OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae1f9dc 3bffa05)
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 18 Nov 2010 00:47:59 +0000 (16:47 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 18 Nov 2010 00:47:59 +0000 (16:47 -0800)
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8


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