summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-06-06 19:45:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 19:45:19 +0000
commit40776410db25852d4e852bf96026949028083547 (patch)
treea11be2fa9debffae8907b6d896345d88e2271add /libs/androidfw/ResourceTimer.cpp
parent130ff0ddec5271be0b239fd857496a264e24e0c3 (diff)
parent6ea1459ec3cb3b41437a80951dc777ddb707863e (diff)
[automerger skipped] Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into rvc-dev am: d198f5165c am: 886d492c8c am: f37a92b8c8 am: f32261c4c5 -s ours am: 59bcc039eb -s ours am: 0601f86460 -s ours am: 6da8cd613c -s ours am: c4e6f3d968 -s ours am: 6ea1459ec3 -s ours
am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 67e0292d0c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475765 Change-Id: I33b2b99c98f5b2b06266d58d7a21ff03b96e86be 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