commit | e1daf52b92adf3962ded260a36a9594ef8540823 | [log] [tgz] |
---|---|---|
author | Lucas Dupin <dupin@google.com> | Sat Jan 13 01:13:26 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jan 13 01:13:26 2018 +0000 |
tree | 7e366a0a349198edb7d08fda295006b6822eab6a | |
parent | 64938fb2904fa28459aa9c5d2cd7cc1e4ad07b11 [diff] | |
parent | c80c67e7bc96691b6e3700bac49e819ad52db0ae [diff] |
Merge "Allow custom keyguard "prompt reason""