Resolve merge conflicts

Bug: 166133969
Test: m
Exempt-From-Owner-Approval: rebase
Change-Id: I833f4970233abf074303e1bd9cf26d1e3efdcef4
Merged-In: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7

1 files changed, 26 insertions, 0 deletions

diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
new file mode 100644
index 00000000..9d045184
--- /dev/null
+++ b/contrib/grpc_metrics/Android.bp
@@ -0,0 +1,26 @@
+// Copyright (C) 2020 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+java_library_host {
+    name: "opencensus-java-contrib-grpc-metrics",
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+    libs: [
+        "opencensus-java-api",
+        "guava",
+    ],
+}