diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 07:01:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 07:01:45 +0000 |
| commit | 372a2c302d66d5b96c75ee9a1fab4ec8c5e39abc (patch) | |
| tree | 6b938de20cea946f7f41e9c2a3a0f523512f7798 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ee5c98ffd5305bdb31d99c4770e0f73989ee0393 (diff) | |
| parent | 2fd2954c84300c40f5f480cfa1b7d3a871e13bfb (diff) | |
Merge "Keystore 2.0 SPI: Switch to aidl union KeyParameters" am: 220d33ce2c am: 1769b6bd16 am: 2fd2954c84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iffa2479320dd97650460690652732b59d23c248c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions