Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev

author Philip P. Moltmann <moltmann@google.com>

Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)
author Philip P. Moltmann <moltmann@google.com>
Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Philip P. Moltmann <moltmann@google.com>
	Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history