OSDN Git Service

am 1d4b6eff: am 1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock...
authorIan Rogers <irogers@google.com>
Fri, 22 Aug 2014 22:06:47 +0000 (22:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 22:06:47 +0000 (22:06 +0000)
* commit '1d4b6eff25aa29cbbf4d216d65349e1ad38f962e':
  Using the correct time for wait_start_ms when lock contention logging is enabled

1  2 
runtime/monitor.cc

Simple merge