OSDN Git Service

am c15a9352: am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev
authorYabin Cui <yabinc@google.com>
Wed, 20 May 2015 22:12:31 +0000 (22:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 May 2015 22:12:31 +0000 (22:12 +0000)
commitb042c78e363326a2024da12b4ac5f1452ce9b92c
tree50e1b2ab531de2767251244e8545351384b818de
parent369208d597fc99ab9f82c8308936cbeca8f11765
parentc15a935202319a41ee0be94afcdbde1d07568ec8
am c15a9352: am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev

* commit 'c15a935202319a41ee0be94afcdbde1d07568ec8':
  Fix timer flaky test in lollipop-mr1-cts-dev.