| commit | 40719a337093cca58885e16d6e0ae7f7da5fc7ad | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jan 07 05:46:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 07 05:46:15 2014 +0000 |
| tree | d8d2a645079e7e380315ac3c207fbaa967c7340b | |
| parent | b54384cb1dea088b1a6a1e71113a09995ea11b1e [diff] | |
| parent | 7b6ac45d984eab782d6d635da6e943cae4b76d44 [diff] |
am 7b6ac45d: (-s ours) am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7b6ac45d984eab782d6d635da6e943cae4b76d44': Import translations. DO NOT MERGE