OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caf9477 a42cb8b)
Merge "resolved conflicts for merge of a67e34c8 to master"
authorColin Cross <ccross@android.com>
Fri, 21 Mar 2014 20:19:54 +0000 (20:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Mar 2014 20:19:54 +0000 (20:19 +0000)

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