summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 21:55:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 21:55:41 +0000
commit059e96a28ad447d3dd3f0165c4a02ae3041a12de (patch)
treececdaa370fb4306166f3c0e64f4c5257cfea0fbf /libs/androidfw/ResourceTimer.cpp
parent368d47ce0e4d9bec0823af4ac968d1a34a41d780 (diff)
parent5acc66a6ab647c1e57bab5f94a77f7e1c13e2e32 (diff)
[automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: 7f266ec1c6 -s ours am: ce1e9d8b33 -s ours am: 5acc66a6ab -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335897 Change-Id: Ia4a0e974b668b724c1df2ec856dc393ff00836c1 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