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