tree f3fcf5753503cbe2a57058cd9c5146952b5654a0
parent e1c967ab8f5dcfc9eaf6a883e23761dea9bbe40c
parent 0c299d4d6316d14e43d386b4562782083fe3c886
author Julia Reynolds <juliacr@google.com> 1479507144 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1479507148 +0000

Merge "Prioritize channel sound & vibration settings."