| commit | 6ada5de7c2c5f17f43dff933ea8b74d6048dc61c | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Wed Aug 19 23:55:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 23:55:00 2015 +0000 |
| tree | 29bc3a93cc321b16566f4dbd2b73ba075a7e9e86 | |
| parent | d958ab63a030ea003612130a7c7bc237962cc2c9 [diff] | |
| parent | 728c39597e589b972959d43f4be91f011c34bec1 [diff] |
am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '9a995b2c8fe4ee0567e850f7f63bfd661974f6e7': Use __ANDROID__ instead of __BRILLO__.
diff --git a/metricsd/Android.mk b/metricsd/Android.mk index 0442147..9fd8eda 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk
@@ -42,7 +42,6 @@ serialization/serialization_utils.cc metrics_CFLAGS := -Wall \ - -D__BRILLO__ \ -Wno-char-subscripts \ -Wno-missing-field-initializers \ -Wno-unused-function \