tree 4e2d9eef9fa6208b0d13d0c58a2992849a73b967
parent 83f4847f7b842fafec74fad85878e36b19dfef9f
parent bc6f59a1ef341231c2b57e0cde691be1a5a32203
author John Spurlock <jspurlock@google.com> 1416941123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416941123 +0000

am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev

* commit 'bc6f59a1ef341231c2b57e0cde691be1a5a32203':
  VolumeZen: Introduce internal vs external ringer mode.