tree 362fa7fc244da03be29f8136120f76f4efc92f40
parent 368ad52604c89233eafbd34b483f99c31a7ad7ad
parent 6800e1b9211257bf8dfa79a3c7ebd3e265fcf196
author Jeff Brown <jeffbrown@google.com> 1411506385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411506385 +0000

am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev

* commit '42ecd1447eb31fb6e1a08a7f47b73805b0250680':
  Move setting the display state out of the critical section.