diff options
| author | 2023-08-21 22:56:14 +0000 | |
|---|---|---|
| committer | 2023-08-21 22:56:14 +0000 | |
| commit | 97aab5544eff992f00534e8a02ccd70394c4b3c4 (patch) | |
| tree | a04cb1216b2a19e52fcfa8860d1ffa296c715e32 /libs/androidfw/StringPool.cpp | |
| parent | 52eac22f978b11f338310a14e23d916bca472c3c (diff) | |
| parent | 806181e7599a2e17a1ad4d9861f21d3b04bdc9b7 (diff) | |
[automerger skipped] Merge "Add a 5 second timeout to launch animation touch blocking" into udc-d1-dev am: 9aba81b313 am: f1cda83ce3 -s ours am: 806181e759 -s ours
am skip reason: Merged-In I5c240a9ee852bf57e8ec251b733708086e825b45 with SHA-1 a8bd8a8ba0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24479294
Change-Id: I5ceeba72107a1aa7447abae9ea888471b05b9a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions