am 10eaabfc: am a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave...

author Christopher Ferris <cferris@google.com>

Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)

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

Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)
author Christopher Ferris <cferris@google.com>
Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Christopher Ferris <cferris@google.com>
	Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)
		1	2
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history