diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-26 15:56:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 15:56:14 +0000 |
| commit | e715d99bb1723ce05f6b0a09a90d2802c22225c9 (patch) | |
| tree | d110b7ee9e8ed2a201e059f55c1243b6b021ddc2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3f7e01f490eb4f2dbe090396b99a02dfc056aa25 (diff) | |
| parent | ccef3d8305e1483021224bf791d37e7c759fe5ba (diff) | |
[automerger skipped] Merge "Keystore 2.0: Remove attestKey from KeyChain." am: eb45aabc03 am: c5792c3904 am: ccef3d8305 -s ours
am skip reason: Change-Id I759fe245b48fe435153fded2c74c9ae99634c146 with SHA-1 0f138dc0cc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559810
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ce44e25608c6edbb5eb8f5865a6a751768a52c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions