| commit | 233692b051050faf37931ac8013839de7785f0f2 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:06:01 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:06:01 2013 -0800 |
| tree | 461ba356896549d4e7dc2b4fe9f1b5db203dd1ed | |
| parent | d0e1c273dbf9518b84a0a6f8bdcaa14f13246110 [diff] | |
| parent | f9be657ac28f2530938c24b09458defdbca07c4c [diff] |
am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'f9be657ac28f2530938c24b09458defdbca07c4c': Import translations. DO NOT MERGE