diff options
| author | 2024-10-17 20:57:15 +0000 | |
|---|---|---|
| committer | 2024-10-17 20:57:15 +0000 | |
| commit | 8a48b391ccd07701de399a537476ddcefac0d8a3 (patch) | |
| tree | 935077459fbaaafab35cc744271a921b084bad02 /libs/androidfw/ResourceTimer.cpp | |
| parent | 6ae0cc564d7daa0343cb4aacd6ba786f0a711150 (diff) | |
| parent | 26e9cd615af947d03a815748fb3fb54ce938d916 (diff) | |
[automerger skipped] Merge "Don't register NLS in test" into main am: 397dfb6e02 am: 26e9cd615a -s ours
am skip reason: Merged-In Id19eb4a50008640e9a7ca556fd332f3fca8688ba with SHA-1 30781abdf3 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3311622
Change-Id: Iaa7bcfa7cfaf30f07d22c984b19eb51919d3bf14
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