Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" am: 02e3229580
-s ours
am: 57dc4a18c2
-s ours
Change-Id: Ic5827ccc458a510e7def73966de50b6aae8ed67f
This commit is contained in: