Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: eb5eb22acc am: d1612d15ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017 Change-Id: Ic7aa5cc0c08c3c00aaef4b8643721de63c53dbcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: