OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b270d3 1f3dcff)
resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
authorrepo sync <aalbert@google.com>
Thu, 24 Feb 2011 17:58:25 +0000 (09:58 -0800)
committerrepo sync <aalbert@google.com>
Thu, 24 Feb 2011 17:58:25 +0000 (09:58 -0800)
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4


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