summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author An An Yu <ananyu@google.com> 2022-10-13 00:59:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-13 00:59:43 +0000
commit632d391fbfd9eb596374d8ee3816d128fabe8600 (patch)
treebdf78fca13179069ae28fda7cf449fa8f1687fb6 /libs/androidfw/ResourceTimer.cpp
parenta49371594f07d54a60f5892ca73307dd8cad3765 (diff)
parent4601dd22ee7ecf2dad0fe11f4ffe4667a7efb1d4 (diff)
Merge "Upon double registration just return instead of throwing exception" into tm-qpr-dev am: a3be6a1773 am: 4601dd22ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20181366 Change-Id: I39c1d87546d4f2222919690fecfea3cb7dfae393 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