diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-05-05 13:01:15 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2017-05-05 13:01:15 +0100 |
| commit | 731a7f38a9949bb9d15f9dd16514e7908c84ed9e (patch) | |
| tree | 46c95642cac926eaaae26d01ca986b0691bcfd21 /keystore/java/android/security/KeyChain.java | |
| parent | 62c3698a79280fcf1188bfe861412bc87480b235 (diff) | |
Remove line from bad resolution merge.
Test: build
Change-Id: Ie7f9187ecf63150b9ea36858e80e226c6daaa184
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions