diff options
author | Ed Heyl <edheyl@google.com> | 2013-10-09 09:13:19 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 09:13:19 -0700 |
commit | 8289d0e4dd6337922fcc6a8be83b53bb0b868f7d (patch) | |
tree | eb2fc4cdd0cc5b9ec5be9d5377463bd84d045549 /res/values-zh-rCN/strings.xml | |
parent | 4c1730f0ba253f36b3aec60e6ceb1ac4a5b5ffd0 (diff) | |
parent | c709f36f5949f00f0f776ca170f7742b62624329 (diff) |
am c709f36f: am 5f93d16f: am d49178cf: merge in KFS78N (no-op)
* commit 'c709f36f5949f00f0f776ca170f7742b62624329':
Diffstat (limited to 'res/values-zh-rCN/strings.xml')
0 files changed, 0 insertions, 0 deletions