Merge "packages/apps/Gallery: Set LOCAL_SDK_VERSION where possible."
am: 187c22b4cc

Change-Id: I8c97d2e12d1b2ec4293a24aabefd053af726d35c