OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9af56c f179fe3)
resolved conflicts for merge of 9dfd7d0a to master
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 01:39:37 +0000 (18:39 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 01:39:37 +0000 (18:39 -0700)
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2


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