diff options
| author | 2023-10-12 20:21:55 +0000 | |
|---|---|---|
| committer | 2023-10-12 20:21:55 +0000 | |
| commit | 81a141c6334fbb750d4a16d9d8efa31bae8d503c (patch) | |
| tree | 79b1145a4c35548b901f16856e2d832adb0bbb30 /libs/androidfw/ResourceTimer.cpp | |
| parent | 3649630cce0afaee53b8c09fa67773a4696e48fa (diff) | |
| parent | 788ba62a7cf28b7abd7ff20381d2c09b3b50bdca (diff) | |
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2a2 am: ccc748a0d7 am: 2929859166 am: b11212b320 am: 3569c11009 am: 22454204a6 am: bf624d549f am: 4422416d9c -s ours am: 4f70c06650 -s ours am: 788ba62a7c -s ours
am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593
Change-Id: Ic41bc208ae72741be69d89193d52a57a4e7ec7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions