Merge remote-tracking branch 'goog/master' into merge

Conflicts:
	java/res/xml/method.xml

Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd

java/AndroidManifest.xml

@@ -41,5 +41,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <receiver android:name="SuggestionSpanPickedNotificationReceiver" android:enabled="true">
+            <intent-filter>
+                <action android:name="android.text.style.SUGGESTION_PICKED" />
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

java/proguard.flags

@@ -22,3 +22,7 @@
 -keep class com.android.inputmethod.latin.Utils {
   boolean equalsIgnoreCase(...);
 }
+
+-keep class com.android.inputmethod.latin.spellcheck.SpellChecker {
+  *;
+}