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

Browse Source

am: 4c1922b441

Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d

...

This commit is contained in:

Xin Li

2016-11-09 21:02:08 +00:00

committed by android-build-merger

parent dac1d242ab 4c1922b441

commit ba293f3c28

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