diff options
| author | 2023-07-10 19:30:19 +0000 | |
|---|---|---|
| committer | 2023-07-10 19:30:19 +0000 | |
| commit | 602e7983276d701e4737e082ce771868e85c6f2c (patch) | |
| tree | bb6a3baa745256ed713081aed0ac635ea7e722ad /libs/androidfw/AssetsProvider.cpp | |
| parent | fffc2002c6093efae9bc64f72adc5aa25d0a23ed (diff) | |
| parent | e3164c7d92cd3b8ad85eab492ce636c2ae7eaeac (diff) | |
[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -s ours am: 7bcfc61d96 -s ours am: b1e152fdd3 -s ours am: e3164c7d92 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099
Change-Id: Ic0984903e8aa61fa65b61c92152d6854e4d720be
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