Skip to content
Commit 0a568ae5 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into... 

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fc  -s ours
am: 16090c61  -s ours

Change-Id: I25ba4f5731ecaed22faa95e3948e389405dca7e7
parents 75c6b8c3 16090c61
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment