commit | 63356ff12dd7b0fa751606c680ead165ebac3be0 | [log] [tgz] |
---|---|---|
author | Nancy Chen <nancychen@google.com> | Wed Nov 12 03:42:50 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 03:42:50 2014 +0000 |
tree | a3e968cc7dd4ecba776b4f978e61627cdf86e4b2 | |
parent | 3a3885c4495928362aad9d452307193840336c89 [diff] | |
parent | ec6bda267cd62ae958fdd96aa8b58de3f203fa79 [diff] |
am 30d84e9f: am 832d0fd9: am 3c2dd89d: Merge "String resource edits for InCallUI" into lmp-mr1-dev * commit '30d84e9f4546ee399be04190f6d7041152f1739d': String resource edits for InCallUI