OSDN Git Service

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

Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057


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