am 6d85d168: am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings...

author Jason Monk <jmonk@google.com>

Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)
author Jason Monk <jmonk@google.com>
Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
Simple merge
author	Jason Monk <jmonk@google.com>
	Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history