tree 21893c124ff4d456cd6a935e7f186ec2cbe1ff3e
parent a2cd733c23a8382af54249cfddcd73b9e784103a
parent 2769ac290784d2057f44589aeae5140102b21af3
author John Spurlock <jspurlock@google.com> 1402025969 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402025969 +0000

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