tree 66746de4110175d9cd3d25f30ff1b190b2822404
parent 5b95c755821a966b411b164df18b928d2eda71f1
parent 2ee054b4f099ce67dffc29329612170305053783
author John Spurlock <jspurlock@google.com> 1416417849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416417849 +0000

am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev

* commit '2ee054b4f099ce67dffc29329612170305053783':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.