OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46ee429 8139911)
Merge "resolved conflicts for merge of 16e6e203 to master"
authorCraig Mautner <cmautner@google.com>
Tue, 1 Oct 2013 02:45:04 +0000 (02:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Oct 2013 02:45:05 +0000 (02:45 +0000)

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