OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c21929c f1e1e77)
Merge "resolved conflicts for merge of 74fb97de to master"
authorGabriel Peal <gpeal@google.com>
Tue, 25 Mar 2014 18:32:22 +0000 (18:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 25 Mar 2014 18:32:23 +0000 (18:32 +0000)

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