Skip to content
Commit 9788dd5b 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

Change-Id: I49e2be8c77a13c939fe5f7bf6c16e0e80fb3bbbb
parents 9958eb71 0a568ae5
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