Merge "Rename emma coverage files"

author Sebastien Hertz <shertz@google.com>

Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)

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

Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)
author Sebastien Hertz <shertz@google.com>
Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)
diff --cc core/host_java_library.mk
Simple merge
diff --cc core/java.mk
Simple merge
author	Sebastien Hertz <shertz@google.com>
	Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)
		1	2
core/host_java_library.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java.mk	patch \|	diff1 \|	diff2 \|	blob \| history