summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-08-08 15:32:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 15:32:19 +0000
commit55e6be7a269b304f784fc49a67f9e5b6f6c2bf90 (patch)
tree67b880b98588d6065d0a00017effc95adba8b7c7 /libs/androidfw/ResourceTimer.cpp
parentd2872767a09f28a9f347236837a677dc402f21dd (diff)
parentebd9a9c75e2366709d64c763fc27e9dae2187b4b (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 233b5af7d7 -s ours am: 1c8ffb1359 -s ours am: c04067c184 -s ours am: ebd9a9c75e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550208 Change-Id: I5e6393da546e49ccb256ccd6d94103856f75b858 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