[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: 6daf32caf7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19911498 Change-Id: Iddd82e159f82c354934a4dd10dcb8770142e0be5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: