Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
am: e0adef90bb
am: 775d61dc4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913 Change-Id: Ic76abcc25f194a7043833723db304bab14976465 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: