tree aad3a6b364e8ba4ccf5b6d9882a9a2dc4e92775b
parent 0add6ba06c7c6b5036ad8b0477bb7bc2370c1358
parent ecdce8c6955e8a664813cffa9254a24a77d89453
author Christopher Tate <ctate@google.com> 1420584628 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420584628 +0000

am ecdce8c6: am e21ff23d: am 77ae9511: Further refinement of the alarm batching test

* commit 'ecdce8c6955e8a664813cffa9254a24a77d89453':
  Further refinement of the alarm batching test