diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-21 18:37:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-21 18:37:15 +0000 |
commit | 1769b6bd161d560adb77b7f1f57f903bf169a4fe (patch) | |
tree | af7344c759e237b3b3a42a43e00026683f818365 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fc716eb7424da64a74ce89731bea106a8cad0da0 (diff) | |
parent | 220d33ce2cf0542297b14a26efcee6e6fbd93a8b (diff) |
Merge "Keystore 2.0 SPI: Switch to aidl union KeyParameters" am: 220d33ce2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7cf1ccd129daf146f9672e70423d1a18355e3ed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions