Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa am: d478287ab9

Browse Source

am: a29c7c77b1

Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15

...

This commit is contained in:

Xin Li

2016-11-09 21:26:57 +00:00

committed by android-build-merger

parent a732c69257 a29c7c77b1

commit 7bd6cdf057

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