tree 80a5a288b44fd1363494ea1f915e494eda170953
parent 7e821597748d71eb8f4b74f05370ca2159071657
parent a5d599f7b68e7cff51313394c161f172c4f75c6e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649351347 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649351347 +0000

[automerger skipped] Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 am: a5d599f7b6 -s ours

am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 4f319df8ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I3440da84492a66ce18b9dce52340374a3effb5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>