am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."

author Ying Wang <wangying@google.com>

Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)

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

Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)
author Ying Wang <wangying@google.com>
Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history