OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09a107d 907b884)
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
authorIrfan Sheriff <isheriff@google.com>
Wed, 2 Feb 2011 22:23:10 +0000 (14:23 -0800)
committerIrfan Sheriff <isheriff@google.com>
Wed, 2 Feb 2011 22:23:10 +0000 (14:23 -0800)
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c


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