diff options
author | Dmitry Dementyev <dementyev@google.com> | 2021-03-01 08:07:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:07:59 +0000 |
commit | 7d21d719a501a029615df66b0427a047646ca405 (patch) | |
tree | 80b4da1584eb1fd8981bf72888b8ff07a2d48759 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 69b8cbd32e299e53fee26bb6a1efcdfce970cffd (diff) | |
parent | 25de7c49b8cc81b78adbb74692bb460b35e35027 (diff) |
Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085ee2ff am: 25de7c49b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c23d408e34d6305784e54b7ef00a258b4ea6fab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions