diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 15:53:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 15:53:43 +0000 |
| commit | 720b6dc579a3c6e3c611aeeeffb3de3d23b2ffc9 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b3ec86931e1ee0e7bf4e417a79be4d82bd2ffce0 (diff) | |
| parent | aea2b404f80dba9f49eab7abe47ce4cadbb5c3b9 (diff) | |
Merge "Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd645 am: 902da749ce" into rvc-d1-dev-plus-aosp am: ceb9e76b26 am: aea2b404f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12073451
Change-Id: Iec44431ed28cb30f7950c583929ecbf98c6c10ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions