diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 20:20:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 20:20:36 +0000 |
| commit | 919fc1a3cab7d018d224979ee154e1b9124b142e (patch) | |
| tree | b4b6fae6de5e8d0103c22b0cd0f4e4f164b4eaa4 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d045d1c3d66e2bdf8b3290205504909e348f8278 (diff) | |
| parent | 86b66e81b4237a40a600456b6816c0a918991bd9 (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 am: 86b66e81b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621
Change-Id: Iff182fd27f0c8f70a7ab0f2a2b96c9e9071221f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions