diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-25 18:13:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-25 18:13:18 +0000 |
| commit | a9f628662c348c5926caf5e2df0fd2f245a715bf (patch) | |
| tree | b1da0e5e0ba068eacbf56c55c7436a891174f4bd /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 5aeb085389954a32e1ea2189b7bec8080b0226c5 (diff) | |
| parent | 403a494d5611b4d782981c39b4ed28b2340a32f9 (diff) | |
Merge "Framework's NetworkSecurityPolicy delegates to libcore's one."
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions