OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:44:35 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:44:35 +0000 (20:44 +0000)
commit892385f5203178e26e6a4386688df6826baebe4e
treec9ae1d82105cc4387f229623008b530646187a3a
parentacdb6bb1aa42c126113eff8cb8df86cd42c99c94
parentd167a27c1f0a86e871e3743c4f93a9734493c97a
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f  -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947  -s ours
am: d167a27c1f

Change-Id: I6301865f95712e610ab75031fe401386a8010efd