OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50036a5 70652d0)
resolved conflicts for merge of 845fdba7 to master
authorGloria Wang <gwang@google.com>
Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)
committerGloria Wang <gwang@google.com>
Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce


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