summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-15 14:14:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-15 14:14:03 +0000
commit5d70ea43a4e1449fc2e62833bdf0f0b7fcace15b (patch)
treef19e1007c7ac30d258c04aecf0d42f2f3343ef44 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent623b9bb8cfff909f97e8f5c4508f3981400601be (diff)
parentd297e3ba009f9198c97b5e3b0f8d2166d33a05b9 (diff)
Merge "Use clean calling identity to clear preferred activities am: 089b0bb4f9 am: e7b15792ec" into rvc-d1-dev-plus-aosp am: 15544f58ea am: d297e3ba00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12149990 Change-Id: Iaa7d16149ad75bebcf13bc720b546204f9d6fe78
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions