summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Alex Buynytskyy <alexbuy@google.com> 2023-08-17 19:13:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-17 19:13:59 +0000
commit096f60a555f2bec058c8b6ed291c5b6145757a17 (patch)
treece65966909f8b5f1dab8b6f080cb3b1e1cbfba85 /libs/androidfw/AssetsProvider.cpp
parent060c95128a10ebfe763739a79e11309476213654 (diff)
parentec70f08e02ec15bd0eab5748aa1900507b8b06ae (diff)
[automerger skipped] Merge "Allow apps with pre-release SDK in REL configuration." into main am: bc42a58f4b am: e7cc4456e4 -s ours am: a4526346e9 -s ours am: b44c0620c5 -s ours am: ec70f08e02 -s ours
am skip reason: skipped by user alexbuy Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2713093 Change-Id: Ie95361288e02a2ca1d1785a6d2aa09bbfb4ffa98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions