OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c41d2c4 022d04f)
resolved conflicts for merge of db81dc72 to master
authorAdam Powell <adamp@google.com>
Thu, 8 Dec 2011 02:18:58 +0000 (18:18 -0800)
committerAdam Powell <adamp@google.com>
Thu, 8 Dec 2011 02:18:58 +0000 (18:18 -0800)
Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444


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