summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-08-08 15:41:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 15:41:23 +0000
commit4f408bd5d89fc5e1b988e25499bc981194c70286 (patch)
tree67b880b98588d6065d0a00017effc95adba8b7c7 /libs/androidfw/ResourceTimer.cpp
parent8d47a3646f62b02fe24e04e879307f9f3abefd4f (diff)
parent391ee0db803e4e3db8563470a47b4642dcb7627d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1bbcd79ea6 -s ours am: bbac244a2e -s ours am: 993a33653b -s ours am: 391ee0db80 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19551038 Change-Id: Ia16b523d67bb6a9d51f46e016a98c76ba59dd8a2 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