Merge "[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650
-s ours am: 587d8d7005
-s ours am: 9f395fd0a9
-s ours am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17
is in history" into qt-qpr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
dc0a2a6100