OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d24b8d3 73083ed)
resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Wed, 16 Jul 2014 13:05:55 +0000 (14:05 +0100)
committerNarayan Kamath <narayan@google.com>
Wed, 16 Jul 2014 13:05:55 +0000 (14:05 +0100)
Change-Id: I010e48082776070faffe2719d9cb13c307d1dcff


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