commit | 2abb3443170885bc41ccfaa903796f6435b10839 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Oct 05 09:37:01 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 05 09:37:01 2013 -0700 |
tree | 167d642a5dc0c789ac21f92feb55ade088123635 | |
parent | 5318a0d3059c65f51464c7110e34d4f5a33de7be [diff] | |
parent | 040cfe56112326d470a58b2f55642a234ff3fce2 [diff] |
am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '040cfe56112326d470a58b2f55642a234ff3fce2': Import translations. DO NOT MERGE