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

Browse Source

am: 6ec8dd10bb

Change-Id: Ied2074dc34507fcb0dcfca6d68c8780f00dd0bc0

...

This commit is contained in:

Xin Li

2016-11-11 00:12:50 +00:00

committed by android-build-merger

parent 77decadefe 6ec8dd10bb

commit 921dd6a5fd

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