summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2021-02-16 02:23:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-16 02:23:51 +0000
commit156f824ad2369bbc905079945430fbd425083986 (patch)
tree73b3ae9c5d9ccf3fca2051299f2d5c9fc5737acf /libs/androidfw/AssetsProvider.cpp
parentdb2c2f8f5142c8393e5e175d11c53a87700d6319 (diff)
parentfe0e96c08bdb2fb04c5b52cb03e4e1b3532cbf4f (diff)
Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 9efa77801d am: 0b263af1fe am: fe0e96c08b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585569 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I88648d8cab6081c178ecdd3b38935658a78b78dc
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions