OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6d3de2 8fa31b3)
resolved conflicts for merge of db46fa25 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 2 May 2011 21:41:57 +0000 (14:41 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 2 May 2011 21:41:57 +0000 (14:41 -0700)
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6


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