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