| commit | 0e3d7951a3864c9f4f730c48985de6d6d83d0ee9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 03 15:40:10 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 15:40:10 2013 -0700 |
| tree | 8d51a048d6b6140c76699c12440c98e28b6b801b | |
| parent | 038ecee9e10d12c43d778f81b0bc51b3c8643bab [diff] | |
| parent | f00ca818761b00f1722737f6115ecc7b75ce146e [diff] |
am f00ca818: (-s ours) am 0ac27a82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'f00ca818761b00f1722737f6115ecc7b75ce146e': Import translations. DO NOT MERGE