| commit | 7b6ac45d984eab782d6d635da6e943cae4b76d44 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jan 06 21:13:55 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 06 21:13:55 2014 -0800 |
| tree | d8d2a645079e7e380315ac3c207fbaa967c7340b | |
| parent | c862dd192ba0225e3ff4908991de6240becb830e [diff] | |
| parent | 7cbf5af891b178523f5091baae4bfa5153cafa3e [diff] |
am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7cbf5af891b178523f5091baae4bfa5153cafa3e': Import translations. DO NOT MERGE