am 630e05b6: Merge "metricsd: move timer.h into include/metrics/"

* commit '630e05b6af5f76bd7f063840e543186bde40ff0a':
  metricsd: move timer.h into include/metrics/

metricsd/Android.mk

@@ -23,7 +23,8 @@ libmetrics_sources := \
   c_metrics_library.cc \
   metrics_library.cc \
   serialization/metric_sample.cc \
-  serialization/serialization_utils.cc
+  serialization/serialization_utils.cc \
+  timer.cc
 
 metrics_client_sources := \
   metrics_client.cc

metricsd/timer.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "timer.h"
+#include "metrics/timer.h"
 
 #include <string>
 

metricsd/timer_mock.h

@@ -21,7 +21,7 @@
 
 #include <gmock/gmock.h>
 
-#include "timer.h"
+#include "metrics/timer.h"
 
 namespace chromeos_metrics {
 

metricsd/timer_test.cc

@@ -20,8 +20,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include "metrics/timer.h"
 #include "metrics_library_mock.h"
-#include "timer.h"
 #include "timer_mock.h"
 
 using ::testing::_;