Commit 304b1a18 authored Dec 14, 2017 by Elliott Hughes Committed by android-build-merger Dec 14, 2017

Merge "BENCHMARK_MAIN now requires a semicolon." am: 981379b7 am: 64c59c23

am: 1aee7755

Change-Id: I34a85e2786407dc3d9bdd0e64dc6dc0a627974b5

libziparchive/zip_archive_benchmark.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,4 +84,4 @@ static void Iterate_all_files(benchmark::State& state) {
		}
		BENCHMARK(Iterate_all_files);

		BENCHMARK_MAIN()
		BENCHMARK_MAIN();