OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b63107 476ceb8)
resolved conflicts for merge of a7f68230 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 23:06:25 +0000 (16:06 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 23:06:25 +0000 (16:06 -0700)
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9


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