| commit | b4b0e65ed8d4bfcf88a14e66b21973e447669c4d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 17:03:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 17:03:22 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | 40193c9ee568bb52c30a1ebd96db77bd84a86292 [diff] | |
| parent | b76ca05fef52f48db02de46c4ef15348e554fff4 [diff] |
am b76ca05f: (-s ours) am fb52c953: (-s ours) am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b76ca05fef52f48db02de46c4ef15348e554fff4': Import translations. DO NOT MERGE