tree e9f553ecc117b21c42047bf663f2c670d2ed330c
parent b3fa8d87e0b1ed184b449de4ec06f786820e40af
parent f6d766020f9b4d082ee38c38e6496655e1e56c61
author Julia Reynolds <juliacr@google.com> 1468424016 +0000
committer android-build-merger <android-build-merger@google.com> 1468424016 +0000

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

Change-Id: I89ee22c5304e7de651aa34bddf5635f2e87e6b01