tree 6df45f8fa00fdb3c4e0be33274862d59a4160ab3
parent e1d12668c1f443b1c71b5e78587353dffa5b1774
parent c3d0d860b6f9c6b5b09ef2ae62d59139453299dd
author Dianne Hackborn <hackbod@android.com> 1295050295 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295050295 -0800

am c3d0d860: Merge "Make the Phone options dialog use current language"

* commit 'c3d0d860b6f9c6b5b09ef2ae62d59139453299dd':
  Make the Phone options dialog use current language