summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2022-11-01 15:52:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-01 15:52:37 +0000
commitf571b44fd7c3025d317993f15384cec4448823da (patch)
tree02ea60762fe653e907c89daabbec0239963a0951 /libs/androidfw/ResourceTimer.cpp
parent124e64f894b4568e3b96e9be5b93153569098509 (diff)
parent3b0103fa7739359f5cb25321a6a056e4264236c0 (diff)
Merge "Only honor passed-in userid value if work profile flag enabled" into tm-qpr-dev am: 6af3a82437 am: 3b0103fa77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20303911 Change-Id: I004ad6a47d3b0402e4efbe7ef8633611a433c42c 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