OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e26f4a3 05d7350)
resolved conflicts for merge of 4dcd2ee8 to master
authorDianne Hackborn <hackbod@google.com>
Mon, 1 Mar 2010 19:30:02 +0000 (11:30 -0800)
committerDianne Hackborn <hackbod@google.com>
Mon, 1 Mar 2010 19:30:02 +0000 (11:30 -0800)

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