diff options
| author | Peter Collingbourne <pcc@google.com> | 2018-11-15 16:10:08 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-15 16:10:08 -0800 |
| commit | ceebc76cb2a855bb7545f3824a6ba18ed34a925c (patch) | |
| tree | 5af1fb9cf6c71181f876655fdfe8e9ea4856f290 /keystore/java/android/security/KeyStore.java | |
| parent | 81e18816f97564fcbc29924e322aee3dc1eba725 (diff) | |
| parent | e03a81cce81392a34512d9b4ee3b36045d045fb5 (diff) | |
Merge "Preserve x18 while preloading SP-HALs in the zygote." am: 23fd045842
am: e03a81cce8
Change-Id: I577e0964abbf758234af6f80dcc69a55ee57d736
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions