commit beb580b941af9ee24e770d759f01384c04a5cbd7
author Hongyu Chen <hongyu@google.com> Tue Aug 25 16:19:33 2015 -0700
committer Hongyu Chen <hongyu@google.com> Tue Aug 25 16:19:33 2015 -0700
tree cbe84f31ac899d6aae2ed70a2fa561ca24006c55
parent c22b1796a265057984a25793cfe27f742661c34d

More merge conflict fix

BUILD

diff --git a/BUILD b/BUILD
index 26251f7..d612d9c 100644
--- a/BUILD
+++ b/BUILD
@@ -209,6 +209,8 @@
     "src/core/json/json_reader.h",
     "src/core/json/json_writer.h",
     "src/core/profiling/timers.h",
+    "src/core/statistics/census_interface.h",
+    "src/core/statistics/census_rpc_stats.h",
     "src/core/surface/byte_buffer_queue.h",
     "src/core/surface/call.h",
     "src/core/surface/channel.h",
@@ -475,6 +477,8 @@
     "src/core/json/json_reader.h",
     "src/core/json/json_writer.h",
     "src/core/profiling/timers.h",
+    "src/core/statistics/census_interface.h",
+    "src/core/statistics/census_rpc_stats.h",
     "src/core/surface/byte_buffer_queue.h",
     "src/core/surface/call.h",
     "src/core/surface/channel.h",
@@ -1228,6 +1232,8 @@
     "src/core/json/json_reader.h",
     "src/core/json/json_writer.h",
     "src/core/profiling/timers.h",
+    "src/core/statistics/census_interface.h",
+    "src/core/statistics/census_rpc_stats.h",
     "src/core/surface/byte_buffer_queue.h",
     "src/core/surface/call.h",
     "src/core/surface/channel.h",