tree e61d6cd3995b98d28fb26c24becd34a267176f85
parent d29f2d263af9a3017799d3098ed208a49c5ecc69
author Dianne Hackborn <hackbod@google.com> 1357785097 -0800
committer Dianne Hackborn <hackbod@google.com> 1357786311 -0800

Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog

The volume panel now forces us out of the UI modes while it
is up.

Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951