tree b35feade7894ab5e8d97d4269658250c9a0d33e4
parent ed50e94d6c47a99c9dae0b950a258c074576493e
parent afcece8115d89802b0618dacf8a6a18fc5a349b1
author Matthew Williams <mjwilliams@google.com> 1401998934 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401998934 +0000

am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev

* commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
  Add persistence of tasks for TaskManager & BatteryController