diff options
| author | Shawn Willden <swillden@google.com> | 2020-12-10 23:49:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 23:49:39 +0000 |
| commit | ce6b4c47e2bb61eae446057d25d382b23aa2eba8 (patch) | |
| tree | f0f73c1dbb72d8f5cb2e1c29fce62e5bb96ee92e /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | 864505529cba16d683f896871dd7056dcfd03016 (diff) | |
| parent | 50df7a46cf7ff1d4f8a35cb8adeeee601b295f28 (diff) | |
Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c3865132 am: 50df7a46cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iefc964a514ea1f5a81de0ce573ca7fe99d0fa5ed
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions