Skip to content
Commit 8df3caae 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 skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0 is in history

Change-Id: I68e908f8495b1dcaa5a248867b8c059ed0cab4cc
parents 1ea0c70d 000415be
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