Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.

Browse Source

am: 9b9906e9c0  -s ours

Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c

...

This commit is contained in:

Xin Li

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

committed by android-build-merger

parent e9cd3aea19 9b9906e9c0

commit b9634f3081

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