Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: OWNERS

Issue 2440763002: Fix Android build issues and gRPC LB policy (Closed)
Patch Set: Synced to latest Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « BUILD.gn ('k') | build.yaml » ('j') | src/core/plugin_registry/grpc_unsecure_plugin_registry.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: OWNERS
diff --git a/OWNERS b/OWNERS
index 1a390242f1d7132b347d6c5423940b6b231aff31..6ad0ceeca8c6383c4925ed39931b22047d5735e7 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,7 @@
xyzzyz@chromium.org
gcasto@chromium.org
maniscalco@chromium.org
+<<<<<<< HEAD
xyzzyz 2016/10/21 20:14:38 Remove merge conflict marks.
+perumaal@chromium.org
+=======
+>>>>>>> 37667a0807047c1c7ca4e1ebc9ce5c5cc1faa7e8
Garrett Casto 2016/10/21 20:18:25 Need to fix this :P
« no previous file with comments | « BUILD.gn ('k') | build.yaml » ('j') | src/core/plugin_registry/grpc_unsecure_plugin_registry.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698