tree eea43004d7f9bb6e619c6c86560ca1761dadc258
parent ee8576d11413c7b9d42f466fb378921b4cdb01f3
parent 0660be899f2d907dedbcb643315b73e652ec9510
author Yabin Cui <yabinc@google.com> 1439320233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439320233 +0000

am 0660be89: am a6a12a78: am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev

* commit '0660be899f2d907dedbcb643315b73e652ec9510':
  Fix flaky test time.timer_settime_0.