tree 29659fa8891c64479b77363afc0bc863071dd851
parent cd9e75af015aa06d6e37a126d1ee92bfd63496dc
parent a1db26536913f1259ad74c5e6e952521c05bf2f0
author Angus Kong <shkong@google.com> 1369938417 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369938417 -0700

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

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