| commit | 87bb17226ef9cbdc0a49628b57ca48152d8513ca | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Apr 29 21:19:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 29 21:19:46 2014 +0000 |
| tree | 1d92c5e4b60bc9ad3fec078ab9e6032ac79cdb3f | |
| parent | 422c134f4d2a4d1b7ae57e4dae3e13ea2e80b1c2 [diff] | |
| parent | 87cf81d2608fd4fa7b3e254c6ea1b509ff5bcc54 [diff] |
am 87cf81d2: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '87cf81d2608fd4fa7b3e254c6ea1b509ff5bcc54': Import translations. DO NOT MERGE