commit | 9cb38525c522d01481ac7bb9cc5386a90b49aeb4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Apr 17 18:12:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 18:12:45 2014 +0000 |
tree | 651c569526b5d0384c84eaa070cc49c08cb6c640 | |
parent | 6aec970252a51ea187a5b760b7d157f945f32caa [diff] | |
parent | 0c4d25f79987577d4b5a4c63d4ee25773c0fb472 [diff] |
am 0c4d25f7: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '0c4d25f79987577d4b5a4c63d4ee25773c0fb472': Import translations. DO NOT MERGE