Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb

Browse Source

am: 34de2a2d45  -s ours

Change-Id: Ifbc0ae4b514592e5e731b555bd4d393e46ad136d

...

This commit is contained in:

Xin Li

2016-11-09 20:24:12 +00:00

committed by android-build-merger

parent 0a568ae56e 34de2a2d45

commit a5c82e7dd9

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