Merge "Use SDK_INT constant in the javadoc of SAW intents"