OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 21:25:42 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 21:25:42 +0000 (21:25 +0000)
commita732c6925752be9d7909a3e1d3f6aa2dfc6a106a
treef607dcc26a14e2b9d4fb2f40b78b8a31471ac693
parentbec3a79a2751ca5ba6871c94bdbc167004575471
parenta009932a572d97e2bcc95e508d7b17953e8f8921
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 am: 892385f520 am: 4c1922b441 am: ba293f3c28
am: a009932a57

Change-Id: I5cf1015e071c8a98d63fc318088746c9728f3795