tree 039aa603af6a5e96fd3d9ab48229633f524806cf
parent 9cbfe8d5ea68308ece1e57b4b8e38bf5f0344951
parent 91fffb39cf1eb7919cab48c56eb1b44727f4e5c2
author Angus Kong <shkong@google.com> 1369938454 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369938454 -0700

am a1db2653: Dismiss settings when showing popup in Video mode.

* commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0':
  Dismiss settings when showing popup in Video mode.