commit | c0d13a0df295433775ac342b9006143fd9737504 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Oct 11 08:11:36 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 08:11:36 2013 -0700 |
tree | d49926f85e5f332e61fe1d063f3d68ac79427a95 | |
parent | 6b1e5a54955896a0b1bcd5d7e2b42a92dafcdd80 [diff] | |
parent | 94a2e9f9573a0526dba637e38670c526d824f139 [diff] |
am d0444e27: (-s ours) am 36533686: (-s ours) am b99eeb43: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd0444e279944f9f0037c483ed47ce33e6adeeb37': Import translations. DO NOT MERGE