[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours
am:32a9b548e3-s ours am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA10a33d62a17is in history Change-Id: Iebd57656a9456105f13a8d9de44ded0a4f1e29df
This commit is contained in: