diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-20 16:31:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 16:31:51 +0000 |
| commit | 5e27a324ac9c96007f171b659a0b2215af2734b0 (patch) | |
| tree | 435486687440e7a68c386859c98f9e1a60cbb0b4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7464e2df2a31ce998e223d9dbe821d4d265936cc (diff) | |
| parent | f327ea256c241f5df0d837d5b4aec3fdd384aa57 (diff) | |
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83b779a7bc27edd064727bdf9899b7d39345a35d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions