| commit | c5d3d02549c7971bb9690e322c6857c4868760df | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 06 22:45:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 22:45:33 2014 +0000 |
| tree | 8067cb3e804339e5cb879e880284817a449f831d | |
| parent | 3abd1490404d2971ccd06924bbc658de5a094caa [diff] | |
| parent | 61365506c17bd9675b31de94a1ed2a2582c232f5 [diff] |
am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '61365506c17bd9675b31de94a1ed2a2582c232f5': Import translations. DO NOT MERGE