Merge "BENCHMARK_MAIN now requires a semicolon." am: 981379b70f

am: 64c59c23f3

Change-Id: I430d1a3abfdc163a0f0ccc215030106ed3a20c6c
This commit is contained in:
Elliott Hughes 2017-12-14 23:34:38 +00:00 committed by android-build-merger
commit 1aee775518

View file

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