summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJosh Tsuji <tsuji@google.com>2021-08-09 19:41:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-09 19:41:56 +0000
commitd52c7e3ec8f8c099b8f8e649bf19fff5b1b0ca96 (patch)
treef9e87841560d811e4a4d8548127b057276f83c97 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent37d1776badd36d262016d3572b43ee9d58ffabe5 (diff)
parent5f51b92263c1f73fb7d7c70c6706887e9d479aa3 (diff)
Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev am: 5f51b92263
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15486170 Change-Id: I2cc2ba666faab889c25da664480f0e878fdcc7d2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions