| commit | 24ce0f1e62b5ae8c4ab35413007dbe9f324180f3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:48:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:48:47 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | 55eacca29aeb6afb2cd240f9ae4057c467cb24f2 [diff] | |
| parent | a4ce428848d61b5a2e3508627840fd6dfe2ad478 [diff] |
am a4ce4288: (-s ours) am 0b41f0f3: (-s ours) am ad1d1aac: (-s ours) am 7b9c7ea0: (-s ours) am 1c0e52d6: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a4ce428848d61b5a2e3508627840fd6dfe2ad478':