release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release-4080221 snap-temp-L23400000072087081

Change-Id: I2e8fb92435a26a91acb65a21f1c4c26f72f9e619
diff --git a/Android.bp b/Android.bp
index f817981..862ae81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -125,6 +125,9 @@
         "-Wno-error=c++0x-compat",
         "-Wno-non-virtual-dtor",
         "-Wno-sign-promo",
+
+        // Temporarily suppress the warning http://b/37911198
+        "-Wno-error=user-defined-warnings",
     ],
 
     debug: {