summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Robert Horvath <robhor@google.com> 2022-03-24 11:58:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-24 11:58:14 +0000
commitb75312a4f3e5d2453fd4f748e2dc3d74c4205f83 (patch)
treeed00b4778d8d474529058599dc5e89ec30e12d0d /libs/androidfw/ResourceTimer.cpp
parentc47e9d0053620187809ebcd58e7bafb3771bd191 (diff)
parent6d28cc443b30ddbc899a0cf648977feef79cb565 (diff)
[automerger skipped] Merge "Annotate setUidFirewallRule with @GuardedBy" am: 7695e38ec7 am: 012b5cf16b am: 6d28cc443b -s ours
am skip reason: Merged-In I1f6c3c9e339935c06b3edd5436b2b1a7922a67ed with SHA-1 22fc59ad6f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991973 Change-Id: I9f7190e418edb20f43b664fa093173c0f95fe52a
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions