| commit | 7927e3074ac558b7f60f4bb39237c261cfdd499e | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Thu May 02 02:15:57 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 02 02:15:57 2019 -0700 |
| tree | ff38344bafe6a35add8c0757159faf27c21c984f | |
| parent | 1c9ea49dee1e3d178f09a4c265ec5de03e83fc87 [diff] | |
| parent | f597e1877ff457971bc6855f108cd447bbbb151b [diff] |
Merge "Prevent SecureNfc disable if keyguard is locked" am: f597e1877f Change-Id: I527bb2454b55ead5fcf1f8976b8dbead4c0b3faa