| commit | 5c47cee0837154f4cd09815c8cfd851af223c809 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 12 17:50:55 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 17:50:55 2013 -0800 |
| tree | 00ddb881df5c6c90e0e39ff862edba5e79c2ead2 | |
| parent | 7139cc38af688ec372e3412a956a8582719bb840 [diff] | |
| parent | 6a8a163d88d5bf53216035ce30f63f5b6aff442b [diff] |
am 6a8a163d: (-s ours) am d823988b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6a8a163d88d5bf53216035ce30f63f5b6aff442b': Import translations. DO NOT MERGE