tree 5fc4f8707428e2cacb8761b36f6de18c1dbd057d
parent 98bc4a6a790abda53b621fac2354af6f324ee930
parent a5a61e372aac9a6a1f738a0f25ca7a1fce12c225
author Nancy Chen <nancychen@google.com> 1415907897 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415907897 +0000

Merge "String resource edits for Telephony" into lmp-mr1-dev