tree b6e598860494b5d8a6d6a8fd50e19a61cf7509cf
parent a786acd66e92d83ec6b1983f2e43d7d91369d935
parent 1aace738c89ded4a0a4d2db3afedf19d1ab5aa4c
author Nancy Chen <nancychen@google.com> 1415763774 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415763774 +0000

am 1aace738: am fc322e88: am 15621e00: Merge "String resource edits for PhoneCommon" into lmp-mr1-dev

* commit '1aace738c89ded4a0a4d2db3afedf19d1ab5aa4c':
  String resource edits for PhoneCommon