OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d32f8e9 56b9fe2)
resolved conflicts for merge of e95c07bd to master
authorDianne Hackborn <hackbod@google.com>
Tue, 14 Jun 2011 23:13:26 +0000 (16:13 -0700)
committerDianne Hackborn <hackbod@google.com>
Tue, 14 Jun 2011 23:13:26 +0000 (16:13 -0700)
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6


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