OSDN Git Service

am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev
authorYabin Cui <yabinc@google.com>
Wed, 20 May 2015 21:48:09 +0000 (21:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 May 2015 21:48:09 +0000 (21:48 +0000)
commitc15a935202319a41ee0be94afcdbde1d07568ec8
tree9d3b172d2bd44cb2db23ffee54a6937b73697033
parent7490c5c5944391e99bc6c3564bce03d3cd4a39e0
parentfd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82
am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev

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