Merge "Update SharedPreferences javadoc"