tree f5d3610c274b0e091de9a98005762cfa3ddf862e
parent af42d9ddbc08f329d780083349aab0ee2e272e9c
parent b955a66e40cdc01332dcc7e74c962ee764bd8468
author Andrew Lee <anwlee@google.com> 1414695962 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414695962 +0000

am b955a66e: Merge "Add VoicemailRingtonePreference to contain lookup logic." into lmp-mr1-dev automerge: 4b94a31

* commit 'b955a66e40cdc01332dcc7e74c962ee764bd8468':
  Add VoicemailRingtonePreference to contain lookup logic.