Kevin Chyn 75517cb6a8 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d ...

am: 6d549437af

Change-Id: If055528ab0d92318fc552c2396465cecd8e5acea

2019-07-26 12:45:44 -07:00

..

com/android/settings

Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d

2019-07-26 12:45:44 -07:00