Skip to content
Commit 2129e3b7 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 am: 0a568ae5 am: 9788dd5b am: 6ec8dd10 am: 921dd6a5  -s ours am: 05a61276 am: 23270f13 am: 5386c74a am: f3e0e13b
am: 3a86cff4

Change-Id: I4b2964c8393965be2597f48728ee0985cecc627f
parents 3fca84af 3a86cff4
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