Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311

Browse Source

am: 5386c74a44

Change-Id: I122525c6a85e1542370835d88e83cad30f747bff

...

This commit is contained in:

Xin Li

2016-11-14 13:30:19 +00:00

committed by android-build-merger

parent 05f59b1f1d 5386c74a44

commit f3e0e13b54

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