Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2

Browse Source

am: 84a9614947  -s ours

Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae

...

This commit is contained in:

Xin Li

2016-11-09 20:34:42 +00:00

committed by android-build-merger

parent 12f98789bf 84a9614947

commit d167a27c1f

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