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