Commit f10e1ed1 authored Aug 20, 2015 by Daniel Erat Committed by Android Git Automerger Aug 20, 2015

am 2e406f64: am 9a995b2c: Merge "Use ANDROID instead of BRILLO."

* commit '2e406f64':
  Use __ANDROID__ instead of __BRILLO__.

metricsd/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ metrics_daemon_sources := \
		serialization/serialization_utils.cc

		metrics_CFLAGS := -Wall \
		-D__BRILLO__ \
		-Wno-char-subscripts \
		-Wno-missing-field-initializers \
		-Wno-unused-function \