| commit | d600b89baa095e2af640fcd94315a4e4babeea23 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 07 12:52:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 12:52:41 2013 -0700 |
| tree | 9c76521c46915242d77d270965096580d9447628 | |
| parent | 8ac1375e7ed41f3879b99d35003720c9d55ff689 [diff] | |
| parent | 6b16e66675750a8c0537c33748c202aa82f0c7a4 [diff] |
am e68c0128: (-s ours) am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e68c01289eebc5a24b4f5652db19a1a6a3e1a066': Import translations. DO NOT MERGE