| commit | fbb3ae6ca69b3c2ee490fdf4471207627d7eafa7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 17:27:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:27:22 2014 +0000 |
| tree | 4e4529e61c01e51466daf87dc76a575ba8965144 | |
| parent | 2c595209f99103be6572bafe4ad7faf52f81bbcb [diff] | |
| parent | cdd07216563faccad1c439eee23ca9d4b64c0ac7 [diff] |
am cdd07216: (-s ours) am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'cdd07216563faccad1c439eee23ca9d4b64c0ac7': Import translations. DO NOT MERGE