commit | 4d559277064a550e94385e008dd1f40948daf3db | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Apr 17 18:12:54 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 18:12:54 2014 +0000 |
tree | 651c569526b5d0384c84eaa070cc49c08cb6c640 | |
parent | bd37992743b3943b776a7133f68063db9c1e03a5 [diff] | |
parent | 5f0f54871fc6014af06d6c265b8ae42e7da0b9d5 [diff] |
am 5f0f5487: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '5f0f54871fc6014af06d6c265b8ae42e7da0b9d5': Import translations. DO NOT MERGE