Merge "Updating version check to use SDK_INT" into ub-launcher3-calgary