Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""

author Nicolas Geoffray <ngeoffray@google.com>

Tue, 29 Jul 2014 08:36:21 +0000 (08:36 +0000)

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

Wed, 23 Jul 2014 19:30:00 +0000 (19:30 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Tue, 29 Jul 2014 08:36:21 +0000 (08:36 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 23 Jul 2014 19:30:00 +0000 (19:30 +0000)
diff --cc runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
Simple merge
diff --cc test/Android.run-test.mk
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Tue, 29 Jul 2014 08:36:21 +0000 (08:36 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 23 Jul 2014 19:30:00 +0000 (19:30 +0000)
		1	2
runtime/entrypoints/quick/quick_trampoline_entrypoints.cc	patch \|	diff1 \|	diff2 \|	blob \| history
test/Android.run-test.mk	patch \|	diff1 \|	diff2 \|	blob \| history