| commit | eb426901f671f6ef92342a1aa79088fd7db4c9ee | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 17 08:40:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 17 08:40:42 2013 -0700 |
| tree | fcfb8c5763ef4a2fbba0b2b6f320b63e87959b8b | |
| parent | 6a7c433fcbade556f094a17aa8a4963fcea97ae0 [diff] | |
| parent | 8bda640f01a7d9df2f5095532ef8141130a96bc4 [diff] |
am 8bda640f: (-s ours) am 2a754aae: (-s ours) am d67e7fd6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8bda640f01a7d9df2f5095532ef8141130a96bc4': Import translations. DO NOT MERGE