Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426 am: c8ac64aca7 am: b7f279051e

Browse Source

am: d05a06d1e2  -s ours

Change-Id: I0931d2e1abf4a28949ceec6c0d0838b4a94f488b

...

This commit is contained in:

Xin Li

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

committed by android-build-merger

parent 33449ceedf d05a06d1e2

commit b5acbedeb6

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