tree 3a4bcedd1951107bf9870c5ad08782aa5d0f607b
parent e8e4437a6459d1b436b31b3d6c96a886fde72c09
parent 543650bb10b1104dd4ebb81e4a9bbebf9fb4c535
author John Spurlock <jspurlock@google.com> 1406321879 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406321879 +0000

am ec2b8cb3: Merge "Volume: Show safe media warning in settings." into lmp-dev

* commit 'ec2b8cb3482486d3114ea6f33af272f5e86a56d3':
  Volume: Show safe media warning in settings.