tree be0e14f884d677478feb4a44012621673912bd2f
parent 08554d5facda477175f55efa0534e23a3e52b09d
parent 38553adb4fb42bde28f4a08fb115650741f14643
author John Spurlock <jspurlock@google.com> 1410308103 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410308103 +0000

am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev

* commit '0b7a576895b15d19fd0b1880ccba633ea1d6010a':
  On db upgrade, reset ringer mode to normal.