summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-04-06 10:08:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-06 10:08:31 +0000
commit41f355aa7b660f457da2f5b9b58b3a1277063f66 (patch)
treec3cbf26b7e144f6d76632bb6f80db4e6bf84993f /libs/androidfw/ResourceTimer.cpp
parentb2eaa326ba0b6d718113508f36d373692d3f0f01 (diff)
parent3336037847e6ff1451f4c4eb35ccfcda3800e0f1 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1360ebb441 -s ours am: 39b0da14c3 -s ours am: b1cc81c365 -s ours am: d89471ec58 -s ours am: 896784c81c -s ours am: 5206e4ebd2 -s ours am: 70f94abe74 -s ours am: 3336037847 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22455204 Change-Id: I99735f20e2eadd2af513bfecfbdcad33186b0a82 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