am 78b367a6: Merge "Submitted wrong changelist!" into lmp-dev

* commit '78b367a666deb0325b5f509021b14a53625d3786':
  Submitted wrong changelist!

diff --cc runtime/runtime.cc
Simple merge

diff --cc runtime/trace.cc
index ca5e150,1a450c4..f51b8c4
--- 1/runtime/trace.cc
--- 2/runtime/trace.cc
+++ b/runtime/trace.cc
@@@ -174,15 -175,15 +174,15 @@@ bool Trace::UseThreadCpuClock() 
  }
  
  bool Trace::UseWallClock() {
 -  return (clock_source_ == kProfilerClockSourceWall) ||
 -      (clock_source_ == kProfilerClockSourceDual);
 +  return (clock_source_ == kTraceClockSourceWall) ||
 +      (clock_source_ == kTraceClockSourceDual);
  }
  
- void Trace::MeasureClockOverhead() {
-   if (UseThreadCpuClock()) {
+ static void MeasureClockOverhead(Trace* trace) {
+   if (trace->UseThreadCpuClock()) {
      Thread::Current()->GetCpuMicroTime();
    }
-   if (UseWallClock()) {
+   if (trace->UseWallClock()) {
      MicroTime();
    }
  }

diff --cc runtime/trace.h
Simple merge