tree 9d3b172d2bd44cb2db23ffee54a6937b73697033
parent 7490c5c5944391e99bc6c3564bce03d3cd4a39e0
parent fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82
author Yabin Cui <yabinc@google.com> 1432158489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432158489 +0000

am fd20a8c2: resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev

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