| commit | e9c734514ec6babee4eb91a50d1e035f44369abf | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:06:05 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:06:05 2013 -0800 |
| tree | b99392abc6c71997971dbdebcebcd0f17ded302f | |
| parent | d3e9107be3cfe578d5ee0b9a9a9f696d00fd708b [diff] | |
| parent | 45086ea5e9cc05aedb8b28388a27ae9f6ed64837 [diff] |
am 1aca6e04: (-s ours) am 6695fa52: (-s ours) am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1aca6e04f54cd2144a8acb8fb26e87afe93a42e3': Import translations. DO NOT MERGE