summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorHui Yu <huiyu@google.com>2021-08-27 03:51:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-27 03:51:07 +0000
commitc28a36442dbac4ecde26a779e2ceb4f458b4277f (patch)
tree3fa510272617f249d1dad6a52108195d1ea4c76f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbb01aa8d714b4266fb7b2b1abc0ce91fc85d288f (diff)
parent387bc6cb32c5f2f391ea6f5d9df74c691629d111 (diff)
[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 4a9a5f59c8 -s ours am: 7aaecba06a -s ours am: 387bc6cb32 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676753 Change-Id: I0a7cf1a1dedea39b4a63c3bf52ef7e1bd21a6cbf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions