OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmal...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)
commit503661118a881c958954d60733cfdd43a938402f
treedd3a6d1a536f7334726d82ac09ed9e57b9352bca
parent84a9614947394543719e1beecd6229bc2d9a6970
parent71e62a40586c5919ecfe9e5dec70f81260e294ee
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

Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a