summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2023-06-28 19:43:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-28 19:43:09 +0000
commit2729555205d47f58ff0b3feeddb677ab50aa5533 (patch)
tree94e1863ee7626ebb761d79dabb5d775479784d79 /tools/aapt/Command.cpp
parent52644bc49688f01d4b727ea6fa086c773e8d67a7 (diff)
parent8130300dd5e626f0d302cc5fded7d9bb25a00c4f (diff)
Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d881a am: 8130300dd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2635751 Change-Id: I2fcaf11632efa1a5d31a9adbde349040416319dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Command.cpp')
0 files changed, 0 insertions, 0 deletions