OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f929bbd 176a88f)
resolved conflicts for merge of 176a88ff to master
authorRomain Guy <romainguy@android.com>
Thu, 28 Jan 2010 00:20:49 +0000 (16:20 -0800)
committerRomain Guy <romainguy@android.com>
Thu, 28 Jan 2010 00:20:49 +0000 (16:20 -0800)

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