Skip to content
Commit 5e3c7469 authored by Dave Mankoff's avatar Dave Mankoff Committed by android-build-merger
Browse files

[automerger skipped] Merge "Do not allow the FalsingManager sesion to start... 

[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev am: 000415be -s ours am: 8df3caae -s ours am: 4c4b690c -s ours
am: 8b35a631 -s ours
am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0 is in history

Change-Id: I7ec4d57035147b8aee23005ded5044d05e046920
parents 101dc719 8b35a631
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