summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-08-08 15:19:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 15:19:58 +0000
commit45f01c5195f905edeb362742f5f9211e6785b0c7 (patch)
tree13ec237458e15c0d1dac1010384659fe8cc7273d /libs/androidfw/ResourceTimer.cpp
parentfc82f87a57834bed66789fbe742eebf25422eb44 (diff)
parent05d0a5ec329cbddce510cd4866b8b0a48d3aeb25 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1bbcd79ea6 -s ours am: a69d78d9df -s ours am: 05d0a5ec32 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19551038 Change-Id: Ie389dc1c54ed3b5c449edb6250833c06f515732e 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