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:45:40 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:45:40 +0000 (20:45 +0000)
commit0bf282606f91f4dc2b885d06ebb6a0deda586fd3
treec9ae1d82105cc4387f229623008b530646187a3a
parent892385f5203178e26e6a4386688df6826baebe4e
parent4146229e694b62cc3f91e9794cd7940aa36e8bfe
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

Change-Id: I5530c638ccd5ad8af4115e6d8c5f85351948811d