OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e13c7e efa98a2)
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
authorXavier Ducrohet <xav@android.com>
Mon, 11 Apr 2011 23:15:54 +0000 (16:15 -0700)
committerXavier Ducrohet <xav@android.com>
Mon, 11 Apr 2011 23:15:54 +0000 (16:15 -0700)
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701


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