| commit | 3f5776e8841956dce0c651401eabd2e9368f4e7c | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Aug 20 00:04:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 00:04:10 2015 +0000 |
| tree | c4bcf2a86228111e0e61409ef8614acba72795e6 | |
| parent | 8a430a8c41c37a4299e7009423649802a8b1cfff [diff] | |
| parent | 86802aef8bb16d891cc7b46485188191bf581df7 [diff] |
am 86802aef: am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '86802aef8bb16d891cc7b46485188191bf581df7': 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 \