summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWill Osborn <willosborn@google.com>2021-01-25 18:26:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-25 18:26:50 +0000
commit5c8b4a02515233d9598915c27301d51bf3b05368 (patch)
tree6f63679ac98dc1044a665127d68106fc7b27815a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent26432827e7c970c4492e40c3c03a1a7345486a10 (diff)
parentb64eb0fc2cd4e2daae4fbb5909132ebd2da41f30 (diff)
Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: bd8cffcd86 am: e34f417da1 am: b64eb0fc2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e347ed000fcec2a67047211fad81cae12de054c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions