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