OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:11:37 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:11:37 +0000 (20:11 +0000)
commit6166af96ba9bbb07865ad550e5be700d42b143bb
tree9ca7c0ce655604184dc101ee11ef1ff679f1fca7
parentb232177c61562d4a9068bb20914caddb6fb0982b
parentee2903686f9566a0563bdb7a263ab58454c2634a
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev.
am: ee2903686f  -s ours

Change-Id: I565953c9962f328055512615185de735c33a50bb