am b6125220: am 78e67d73: am 80abf887: Merge "Fix issue #22124996: VI: Command Reques...

author Dianne Hackborn <hackbod@google.com>

Wed, 1 Jul 2015 01:20:39 +0000 (01:20 +0000)

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

Wed, 1 Jul 2015 01:20:39 +0000 (01:20 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 1 Jul 2015 01:20:39 +0000 (01:20 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 1 Jul 2015 01:20:39 +0000 (01:20 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 1 Jul 2015 01:20:39 +0000 (01:20 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 1 Jul 2015 01:20:39 +0000 (01:20 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history