Merge "benchmark: Add jni benchmarks for use in golem"

author Nicolas Geoffray <ngeoffray@google.com>

Wed, 28 Sep 2016 08:24:12 +0000 (08:24 +0000)

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

Wed, 28 Sep 2016 08:24:13 +0000 (08:24 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Wed, 28 Sep 2016 08:24:12 +0000 (08:24 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 28 Sep 2016 08:24:13 +0000 (08:24 +0000)
diff --cc Android.mk
Simple merge
diff --cc benchmark/Android.bp
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Wed, 28 Sep 2016 08:24:12 +0000 (08:24 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 28 Sep 2016 08:24:13 +0000 (08:24 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
benchmark/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history