Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours

Browse Source

am: 6166af96ba

Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082

...

This commit is contained in:

Xin Li

2016-11-09 20:17:00 +00:00

committed by android-build-merger

parent 0a23c1a995 6166af96ba

commit 63c9a312a2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available