OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmal...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 21:03:17 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 21:03:17 +0000 (21:03 +0000)
commitd478287ab9c39ed154b01e5ee44f796d571532c5
tree0ba0f714cb29fee480df3762d015cbc62f9d1102
parentba293f3c284c9a748a6a23247c3e58d6b7c1f973
parent0326b807fa011a1232f9d179c2bc59e67c1e03fc
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a  -s ours am: 4146229e69 am: 0bf282606f
am: 0326b807fa

Change-Id: I84618ae346458ff5db07a40aa6794900842bb222