tree 09ebd46154e512f1c37a1fa004f3ee56453eb60e
parent 40b3830a9c9fa56fde0b919629b22e4fb06018f3
parent 5eed5d8c7b7ca78dd07bc6d441600cb97e0782a1
author Adam Cohen <adamcohen@google.com> 1400534231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400534231 +0000

am 5eed5d8c: Ensure that hotseat callout only occurs when appropriate

* commit '5eed5d8c7b7ca78dd07bc6d441600cb97e0782a1':
  Ensure that hotseat callout only occurs when appropriate