diff options
| author | 2023-07-08 22:43:14 +0000 | |
|---|---|---|
| committer | 2023-07-08 22:43:14 +0000 | |
| commit | 2cdd64b3c8418b49cfe9be19ae669d67ee11aa4a (patch) | |
| tree | 1f65172b909c536836f6a2ee9cc43c0a2096ed2b /libs/androidfw/ResourceTimer.cpp | |
| parent | df45b534ec6b082fd9f56367d863ed061b1e15bb (diff) | |
| parent | 0759710f44616a63ca8531dbddad212f94504078 (diff) | |
[automerger skipped] Merge "Improve user handling when querying for resumable media" into tm-dev am: 4e2018356f am: 73552e2918 -s ours am: 07c120aacb -s ours am: 4f6e1b56fe -s ours am: 0759710f44 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 01d527cdfd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834726
Change-Id: Ie702258827be80fb5d9901bedbdecc60fdc75c37
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