Merge "Remove deprecated WITH_HOST_DALVIK."

author Ian Rogers <irogers@google.com>

Wed, 11 Jun 2014 17:29:23 +0000 (17:29 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 10 Jun 2014 22:15:14 +0000 (22:15 +0000)
author Ian Rogers <irogers@google.com>
Wed, 11 Jun 2014 17:29:23 +0000 (17:29 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 10 Jun 2014 22:15:14 +0000 (22:15 +0000)
diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/thread.cc
Simple merge
author	Ian Rogers <irogers@google.com>
	Wed, 11 Jun 2014 17:29:23 +0000 (17:29 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 10 Jun 2014 22:15:14 +0000 (22:15 +0000)
		1	2
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/thread.cc	patch \|	diff1 \|	diff2 \|	blob \| history