OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1844b17 b0cc4a8)
resolved conflicts for merge of e2aa0490 to master
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 00:50:36 +0000 (17:50 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 00:50:36 +0000 (17:50 -0700)
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067


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