tree 1d3551ccd5fd8883346eef00c6989b9257267b50
parent e4da41e6be7b6cc5d2f26d1c24910785d04c751c
parent c2381727a7ca868842bec5e91b41bb7a83d369f3
author Julia Reynolds <juliacr@google.com> 1468424515 +0000
committer android-build-merger <android-build-merger@google.com> 1468424515 +0000

Merge \\"Attribute manual zen mode in volume panel footer.\\" into nyc-mr1-dev am: f6d766020f
am: c2381727a7

Change-Id: Ibb38d3a68dd642b5d6507341b7e189b77bba9502