Skip to content
Commit 84a96149 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into... 

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee290368  -s ours am: 6166af96
am: 63c9a312

Change-Id: I5123223d1ba04f94d52261ab77d6ec33a0c7dc75
parents 09e10e54 63c9a312
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment