OSDN Git Service

Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours...
authorSelim Cinek <cinek@google.com>
Fri, 14 Oct 2016 14:17:58 +0000 (14:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 14:17:58 +0000 (14:17 +0000)
commitb05ceb233efd2192f5b124fc36769ccf4f7cab28
treea9d591012b8d84d534c767e7b710c1f795c150a4
parent167f01a13a4231ba4a1991fab430f7be6df43bb4
parent8f681f72200e01c48616d2b2f84fc54bc3ba88e8
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a  -s ours am: 00c553e1ba  -s ours
am: 8f681f7220

Change-Id: Ic3fe3a5021097097a3b818040e046de1e9011941