tree 5fc4f8707428e2cacb8761b36f6de18c1dbd057d
parent a5eafd99f465409f333d9d2ab9602cb56add9b5d
parent cbca95d73f1a4fb8a45ce1b209a94d13ed1599ca
author Nancy Chen <nancychen@google.com> 1415991304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415991304 +0000

am cbca95d7: Merge "String resource edits for Telephony" into lmp-mr1-dev automerge: e8092f2

* commit 'cbca95d73f1a4fb8a45ce1b209a94d13ed1599ca':
  String resource edits for Telephony