diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-12 00:26:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-12 00:26:10 +0000 |
| commit | 4ac4916c8d3dde9542fb51c755041de4bb65fe62 (patch) | |
| tree | 1159d8ef5378193caf8528a494ef367628397384 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bd1ec8809f32ad192f4c4646821a5ca36bfd0fe9 (diff) | |
| parent | dd8891acbe9fc6be42d932593812ca90eadc9c35 (diff) | |
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48cb973018ef4f81b088232894c9ae087bd2d431
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions