OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31e6d2e 5ffcfb8)
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
authorKatie McCormick <kmccormick@google.com>
Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)
committerKatie McCormick <kmccormick@google.com>
Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc


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