Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours

Browse Source

am: 00c553e1ba  -s ours

Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c

...

This commit is contained in:

Selim Cinek

2016-10-13 14:18:41 +00:00

committed by android-build-merger

parent d975003af3 00c553e1ba

commit 8f681f7220

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