| commit | 0436894be4c4337a4a60a3ae969428c7a09e0a6b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:54:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:54:29 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | f17ec6f0d37ad28efd37c42ffdbcd71c135c547d [diff] | |
| parent | 470af74d47cebed221e11e0e066a8340c31b6300 [diff] |
am 470af74d: (-s ours) am 6979f4ca: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '470af74d47cebed221e11e0e066a8340c31b6300':