tree 777387021c9acda9e968bac6cd6241328c390c08
parent 05a61276c6cc0c6cc18b8064b173c5cae2c3356c
parent db984f917c2ca09b3245ede9dbea13b50e729ede
author Xin Li <delphij@google.com> 1479128196 +0000
committer android-build-merger <android-build-merger@google.com> 1479128196 +0000

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 am: ae5db8a6dc
am: db984f917c  -s ours

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11