diff options
| author | 2022-11-14 02:20:15 +0000 | |
|---|---|---|
| committer | 2022-11-14 02:20:15 +0000 | |
| commit | 9f483be383316463b9f10ab0f1323f55b17aad81 (patch) | |
| tree | db2312d19b9b71d999160e796a8d1b956cc4d101 /libs/androidfw/AssetsProvider.cpp | |
| parent | fe90cf17fdf450ee8a3f4f3bb4bbbfd352f0ff42 (diff) | |
| parent | b7c661a108fc36b578e79874828bfd58b80c6b8e (diff) | |
Merge "[automerger skipped] Merge "Merge "Add new owner to the resume-on-reboot module." into android12-tests-dev am: 533e4e9b35" into android12L-tests-dev am: ec91f35608 -s ours" into android13-tests-dev am: 67228d6786 -s ours am: d60c9af9ff -s ours am: 0dab5688f9 -s ours am: b7c661a108 -s ours
am skip reason: Merged-In I5af32f68652d5854e6a99b59f2f56fcaac575588 with SHA-1 8c8d787bc6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2249398
Change-Id: I485eb69a1816b34da1570c6e209f0e05f8a5d8c0
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