tree bbb094f1ee9be35c03e4e654e8b9803a2bc2fd31
parent 101a15aebc10d82e36737cfd35c23eeee786020f
parent 8e514f10e0dca108e99c1f65d1663174d6295b3c
author John Spurlock <jspurlock@google.com> 1376923321 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376923321 -0700

am 8e514f10: am f01f1e9b: Merge "Use panel tracking as signal preventing auto-collapse." into klp-dev

* commit '8e514f10e0dca108e99c1f65d1663174d6295b3c':
  Use panel tracking as signal preventing auto-collapse.