tree 06e57c6490ad82c3780c662f75f6c89da9aa5406
parent acb867f17c34828d14b3c71186253a269d85707c
parent 6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213
author Matthew Williams <mjwilliams@google.com> 1444792208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444792208 +0000

am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev

* commit '6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
  Correctly reschedule failed periodic