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