tree 1b808994f0c7b6149cc08fef896ec88ee3db1f54
parent 3faa43a4a6f270e2e1e2ec55b77508084af16757
parent 5452a0df668dc48a1170dcfcb55e069c246bb5d1
author Julia Reynolds <juliacr@google.com> 1438870432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438870432 +0000

am 5452a0df: am 4b74d669: am 48d146c9: am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev

* commit '5452a0df668dc48a1170dcfcb55e069c246bb5d1':
  Store ringer mode on entering DND mode so it can be restored on exit.