OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2263c2 e164ef4)
resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9


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