tree 757c1c3340eb6d8851dadbf311440aa018cd921e
parent 00cef82013c0826bb43c11651d25de8b99335618
parent b245bc750021ce6d220e71625fca66620cdd1f05
author Yabin Cui <yabinc@google.com> 1434740151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434740151 +0000

am b245bc75: am 0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev

* commit 'b245bc750021ce6d220e71625fca66620cdd1f05':
  Fix flaky test of timer_create_multiple in L.