tree 845331ccc1512e12e165561782a4b6d02bb526e8
parent 4622011cfd3e7320c9dfd08f875584712b0f8717
parent 0de75e45957a995a1c08c5a1fbcb5e06ce12ff6f
author Nancy Chen <nancychen@google.com> 1415661434 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415661434 +0000

am 0de75e45: Merge "String resource edits for Dialer." into lmp-mr1-dev

* commit '0de75e45957a995a1c08c5a1fbcb5e06ce12ff6f':
  String resource edits for Dialer.