| commit | 0da3debeb4f01cc950bcdce1df1d7b5f266f39c3 | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Tue Jun 11 18:37:58 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 11 18:37:58 2019 -0700 |
| tree | ed3a6c25d239ceef003825c35f12da6a27a5d49e | |
| parent | df999ccf32b6a50f9f4e413192e786a42d226101 [diff] | |
| parent | 38466fd88653c25b09cfa91d81d13f84167b5c20 [diff] |
Merge "Cancel authentication when secure camera is launched on Keyguard" into qt-r1-dev am: 38466fd886 Change-Id: I1d09eb1d3054f2a3c560b2535974fe027fd40504