summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 20:39:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 20:39:37 +0000
commit6daf32caf7ec44d1014603bbea256524675fcefe (patch)
treed027bc300b9d01e29d6891be77f2e8158fcdbe7d /libs/androidfw/ConfigDescription.cpp
parentd12300ad6dd188c89da150e9a93a99f3a2cd2a0b (diff)
parente6a0da1db9d3810e513c4f6c8fe88912b4535b00 (diff)
[automerger skipped] Merge "[DO NOT MERGE] fpService#authWithPrompt uses correct user handle." into sc-dev am: f7d906ad61 am: 7f49832dcf -s ours am: 6fb333236f -s ours am: 2f12a71b13 -s ours am: e6a0da1db9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19911498 Change-Id: I7c02f8e07479eb268f8db0e8a024bc831e4ac2e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions