Index: base/trace_event/trace_event_impl.h |
diff --git a/base/debug/trace_event_impl.h b/base/trace_event/trace_event_impl.h |
similarity index 99% |
copy from base/debug/trace_event_impl.h |
copy to base/trace_event/trace_event_impl.h |
index 1b1fce34cc209b452da54cad9b68f10696f4b79e..230b50716d7c590bfaa3b41cb19e1cccb03e136e 100644 |
--- a/base/debug/trace_event_impl.h |
+++ b/base/trace_event/trace_event_impl.h |
@@ -811,3 +811,4 @@ class BASE_EXPORT TraceLog { |
} // namespace base |
#endif // BASE_DEBUG_TRACE_EVENT_IMPL_H_ |
+ |
ssid
2015/01/22 16:55:17
rebase error, will remove
|