Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 am: 68d354abce am: 3b4f8bc034 am: 4679b5553e -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
675d02af78