diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 20:12:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 20:12:42 +0000 |
| commit | 86b66e81b4237a40a600456b6816c0a918991bd9 (patch) | |
| tree | 73dd84d825fe063e17f70b83aaf27ca2d5519a8c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5f4cc5326ff63b67780e6c4481b86c63bc9acdd2 (diff) | |
| parent | 3b3345bac374d3529c5ead6b0a0fb9a40ae1da05 (diff) | |
Merge "Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: 2364eaf2e6" into rvc-d1-dev-plus-aosp am: 3b3345bac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621
Change-Id: I622748fa5d3e08017c9cad2d7cae93db52927742
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions