Skip to content
Commit 7e0483fc authored by Xin Li's avatar Xin Li
Browse files

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

lollipop-mr1-dev" into lmp-mr1-dev.

Change-Id: Ia47211f647d0d49b0adf3cb65eba4b9b686bcbff
parents ded4df2e b5b33e36
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