| commit | ddaf6e739041fb0cc65e08fe6866eb31e00dfae1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 21:18:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 21:18:16 2014 +0000 |
| tree | d8d2a645079e7e380315ac3c207fbaa967c7340b | |
| parent | f4b8d07bbd26f024b24d31e5b2a53a8b759b1882 [diff] | |
| parent | 4ee527a461f5b936e0c4471f2470440fcec086b1 [diff] |
am 4ee527a4: (-s ours) am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4ee527a461f5b936e0c4471f2470440fcec086b1': Import translations. DO NOT MERGE