OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb25a94 5865053)
resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp
authorNick Pelly <npelly@google.com>
Fri, 21 Jan 2011 17:41:40 +0000 (09:41 -0800)
committerNick Pelly <npelly@google.com>
Fri, 21 Jan 2011 17:41:40 +0000 (09:41 -0800)
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350


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