Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71

Browse Source

am: ae5db8a6dc

Change-Id: I0a88888750b666eb24c5ba4ad4f08346e36a5bca

...

This commit is contained in:

Xin Li

2016-11-11 00:13:50 +00:00

committed by android-build-merger

parent 921dd6a5fd ae5db8a6dc

commit db984f917c

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