commit | b3c51a994f6e3f0b9e4b9b63b2df0e9010918fe6 | [log] [tgz] |
---|---|---|
author | Nancy Chen <nancychen@google.com> | Fri Nov 14 18:55:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 18:55:04 2014 +0000 |
tree | 5fc4f8707428e2cacb8761b36f6de18c1dbd057d | |
parent | a5eafd99f465409f333d9d2ab9602cb56add9b5d [diff] | |
parent | cbca95d73f1a4fb8a45ce1b209a94d13ed1599ca [diff] |
am cbca95d7: Merge "String resource edits for Telephony" into lmp-mr1-dev automerge: e8092f2 * commit 'cbca95d73f1a4fb8a45ce1b209a94d13ed1599ca': String resource edits for Telephony