tree 5fc166ba52cd9641c97e94e70a74c207bccf5e68
parent 2235288538d0c1758315bba961200d0e2254dedd
parent 2326acb591d889d9492219f5f8f79940fd66ba70
author Jeff Brown <jeffbrown@google.com> 1393288357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393288357 +0000

am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev

* commit '2326acb591d889d9492219f5f8f79940fd66ba70':
  Fix typo that causes dreaming on battery.