diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-20 23:25:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 23:25:35 +0000 |
| commit | 758c0c54bf5115e1a9f3b77c2c07d14bbf75ff53 (patch) | |
| tree | deb1015d336b41a7c75d880e083cb090faa0ae2c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | df24f2b2d96419c9a1aa0e709ff0583e3dfa8741 (diff) | |
| parent | 396957acad423f43a1e7641527f5c8cec6a27c7d (diff) | |
Merge "Keystore 2.0: Integrate onLockScreenEvent." am: 01460b0bd8 am: 2670006095 am: 396957acad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546381
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I801c764ca7c4927ff7ac57e6a9b130e803fa8ebd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions