OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92ce52a bdfa931)
resolved conflicts for merge of 6a828712 to master
authorAdam Powell <adamp@google.com>
Wed, 7 Dec 2011 00:40:49 +0000 (16:40 -0800)
committerAdam Powell <adamp@google.com>
Wed, 7 Dec 2011 00:53:47 +0000 (16:53 -0800)
Change-Id: I73c804667a890bcc9924951ff655137c1345541a


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