OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 282cdfb e7afca1)
resolved conflicts for merge of 74af525e to master
authorWink Saville <wink@google.com>
Fri, 13 May 2011 21:01:16 +0000 (14:01 -0700)
committerWink Saville <wink@google.com>
Fri, 13 May 2011 21:01:16 +0000 (14:01 -0700)
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d


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