tree 2c90b01fd8fccb88c1678aae8abcdb82baa620b5
parent 0551d5d9ee2888779e9c37c9a509451ef65ef981
parent 52e6d458d6cf0af7bda45cb80262af6fc369799f
author Chong Zhang <chz@google.com> 1440793804 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440793804 +0000

am 52e6d458: am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev

* commit '52e6d458d6cf0af7bda45cb80262af6fc369799f':
  Fix deadlock when updating rotation