diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-20 18:56:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 18:56:22 +0000 |
| commit | a4659cc4fec6248f310a5e08037b0aed2077eec5 (patch) | |
| tree | 1dc698a7b09310c03faeb73f14d96a82326189d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 57683e8918d089ee7ff7301c02537f690930cc4f (diff) | |
| parent | 7108d008dbf77e5067b38a18470a7e96b0920fba (diff) | |
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c am: 5e27a324ac am: 7108d008db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I574f5752b3b6e3aabad3305084048ff08c6dd63a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions