OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ed3d10 aa8de55)
Merge "resolved conflicts for merge of 78e9f4cb to master"
authorDianne Hackborn <hackbod@google.com>
Tue, 14 Dec 2010 00:28:01 +0000 (16:28 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 Dec 2010 00:28:01 +0000 (16:28 -0800)

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