| commit | 18f639ca3d3aecb3f9e23e4ea4ae9e05bc3e8230 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jun 23 19:50:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:50:04 2014 +0000 |
| tree | b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60 | |
| parent | b4715023acb61472edd0e21bc0492869733cc5f4 [diff] | |
| parent | 3384585a46cdd77f9e2bf1d07d5e2f2c0130f986 [diff] |
am 3384585a: (-s ours) am 848a8fc2: (-s ours) Import translations. DO NOT MERGE * commit '3384585a46cdd77f9e2bf1d07d5e2f2c0130f986':