OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1fd092 7a3262b)
resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Tue, 8 Feb 2011 18:26:11 +0000 (10:26 -0800)
committerScott Main <smain@google.com>
Tue, 8 Feb 2011 18:26:11 +0000 (10:26 -0800)
Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37


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