summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2020-11-18 23:35:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-18 23:35:14 +0000
commitf74b24e2ecb05f53d5f3b5ae5cfcdfe49cbcb986 (patch)
tree293c6da6fd06bca50f71012b13829dae3ba7a7be /libs/androidfw/AssetsProvider.cpp
parent5784a50609e46bde80060c4498788dd1e2d5e531 (diff)
parent2fabeb61c203a96c8db78c63257eb77bd897315b (diff)
Merge "Revert "Restore preferred activity filter if it not inside"" am: e6439f8866 am: 248bfa3d92 am: 2fabeb61c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503894 Change-Id: I5cbc6b499b6c8dc41cb4a63a5a28f25f1909d15f
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions