OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7fa2e5 1cd2834)
resolved conflicts for merge of 1cd2834f to master
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 12:12:07 +0000 (12:12 +0000)
committerNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 12:12:07 +0000 (12:12 +0000)

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