Skip to content
Commit babe5e6b authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would... 

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae  -s ours am: 20307881  -s ours am: e58f1e59
am: f69a47fc  -s ours

Change-Id: I63d0ced98812deb638ba5f18d5714587814c2dc9
parents 3a788275 f69a47fc
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