OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05a6127 db984f9)
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop...
authorXin Li <delphij@google.com>
Mon, 14 Nov 2016 12:56:36 +0000 (12:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 12:56:36 +0000 (12:56 +0000)
am: db984f917c  -s ours

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11


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