Skip to content
Commit 16090c61 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

Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
parents 583a7017 7e0483fc
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