tree 2a7efeb16db8d3461ed749bbbc1ce4272390bace
parent 3ae5b35142aaf5e4cb5fecbc8c2359a4787e69ce
parent 7e984a953eadb690dbe32462c8860a0b1306e11d
author John Spurlock <jspurlock@google.com> 1402026168 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402026168 +0000

am 0fbd9364: Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev

* commit '0fbd936409cdc233821f3d29b3ec12738febbf62':
  VolumeZen: Only display active condition when entering.