tree c0ffcd888d3c4a18c1cc9db57b0dc90cc7ba3ccb
parent d03592587c6ccc657ee003fcb458b6bddc78057c
parent 0c9bbf4e13f2be6a4b930da2379c77e06a68c2cb
author Jeff Brown <jeffbrown@google.com> 1348705631 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348705631 -0700

am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-dev

* commit '0c9bbf4e13f2be6a4b930da2379c77e06a68c2cb':
  Make DreamManagerService more robust.