summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEvan Rosky <erosky@google.com>2020-07-15 19:56:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-15 19:56:30 +0000
commit35174d85d243a98aa689ee5ed0bf2c6fe8ca3af4 (patch)
tree3744c209741443c0ad0534f07489e3c75e88e7a0 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd50eb6eeb56f4c6b80b171e1cdde83d8886925a7 (diff)
parenta957ca5bfd12daa51fedd99b46b8c6edffcbf702 (diff)
Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: a957ca5bfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621 Change-Id: I7f7f2f52ea107f451b68ea7f4a0a0eaedc4c9aa6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions