tree d2311ec790c51a411a5cc67d1e42f4893a707255
parent 75f47866066d5b06924530417c7cb72296753ccb
parent d2c95f9821c98604ab06fb3d7c6f617bd88ada3e
author Jeff Sharkey <jsharkey@google.com> 1444697717 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444697717 +0000

am d2c95f98: am 97604b42: am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev

* commit 'd2c95f9821c98604ab06fb3d7c6f617bd88ada3e':
  Fix parole scheduling bugs.