| commit | 58c35d0b618a940dda12f531f2b9375b3ccd80c7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 20 09:57:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 09:57:29 2013 -0700 |
| tree | 055b4a0c447012d54ae22fbb1288a124ca0fa229 | |
| parent | cf83beee997c90976afdee2af7212eb27fd2b5f0 [diff] | |
| parent | 16c68d62965f97fdc18650181c7faebe27729182 [diff] |
am 16c68d62: (-s ours) am 07cf6487: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '16c68d62965f97fdc18650181c7faebe27729182': Import translations. DO NOT MERGE