tree e33045f97a10d9cde11e91ce98b0d956449efae4
parent de8b10ee7510eb14561455ee81654ca36a00915a
parent 26aa04c3c4d16ab7bf47d414fac697721e5843cd
author Jorim Jaggi <jjaggi@google.com> 1438216585 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438216585 +0000

am 26aa04c3: Fix state weirdness in the panel

* commit '26aa04c3c4d16ab7bf47d414fac697721e5843cd':
  Fix state weirdness in the panel