| commit | 5db6533c75aa9fc0ee6e6107996f0ad453d65a61 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 12 16:56:03 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 16:56:03 2013 +0000 |
| tree | d8d2a645079e7e380315ac3c207fbaa967c7340b | |
| parent | 1ece6f7f6555e82ba9f0ea352e5aec954189f667 [diff] | |
| parent | 0abf781635a2953a6dd8ffd8a57a84f65fcace5c [diff] |
am 0abf7816: (-s ours) am 478e3183: (-s ours) am 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '0abf781635a2953a6dd8ffd8a57a84f65fcace5c': Import translations. DO NOT MERGE