OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cc6156 903f4a0)
resolved conflicts for merge of fb339016 to master
authorAdam Powell <adamp@google.com>
Thu, 9 Jun 2011 19:15:10 +0000 (12:15 -0700)
committerAdam Powell <adamp@google.com>
Thu, 9 Jun 2011 19:15:10 +0000 (12:15 -0700)
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac


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