summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Jerome Gaillard <jgaillard@google.com> 2024-10-11 15:39:50 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-11 15:39:50 +0000
commit735aa554f2465e62f35f4808af4c1ebfe42e7cdc (patch)
treea6d9a1ab4ab22a84530222435b7f5efbb1b4283e /libs/androidfw/ResourceTimer.cpp
parent0c4883461455425264810fc8e567e1b829973789 (diff)
parent26667c51a8b8e5f08c076ffa10fdde1bd71c6f9e (diff)
Merge changes from topic "cherrypicker-L33600030007059837:N51300030113435133" into main
* changes: Reintroduce support for setting the ICU default locale. Fix ICU-related failures in Robolectric. Register NativeAllocationRegistry JNI methods via jni wrappers. Fix layoutlib build Add back support for 'method_binding_format' in HostRuntime.cpp
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions