| commit | 68a0dee1314b1a8466edd7d61b5228db38778c95 | [log] [tgz] |
|---|---|---|
| author | Erin Yan <yiranyan@google.com> | Fri May 10 01:42:51 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 10 01:42:51 2019 -0700 |
| tree | c180482c8023ecf919751f80021b7d9debfb50ce | |
| parent | 320828c38c41684e4668cf76f5f9de0cd8ebf7b4 [diff] | |
| parent | b3ded7dbfa72cd1bc6c195ccc672cea64a0771f5 [diff] |
Merge "Don't start unlock advertising when the user has no trusted device" into qt-dev am: e293b064ca am: b3ded7dbfa Change-Id: I57912741aaf24b34935c6ab7e1f37352300eeb6d