tree 693435d66a60078c9f2aa22763e01533ebfbcc18
parent 5986a476a72f0f127c82dd1ba78629d58ec85cec
parent f35d4ad150ccac94bcb3a5e518619498aed67b60
author Steve Levis <stevenl@google.com> 1339023558 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339023558 -0700

am f35d4ad1: am 9616a76f: Say "device" instead of "phone" in alarm settings

* commit 'f35d4ad150ccac94bcb3a5e518619498aed67b60':
  Say "device" instead of "phone" in alarm settings