tree d53c808753e51124bec4549fc8052f3a752cd881
parent 4f342e878d88b1f75a9b487e2aa0582b59e29083
parent 8db6d9af58b9b81dbd764acd3f6a379afb539bf6
author Jeff Brown <jeffbrown@google.com> 1396495502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396495502 +0000

am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev

* commit '8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
  Clean up certain state transitions in DreamService.