| commit | b873a17ce7be0a9771c24999adca6964431728f6 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 16 18:16:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 16 18:16:14 2013 -0700 |
| tree | 3337e8c4680cfda58c49f2e704c4d9376ec7f00e | |
| parent | 6155bfb788a771362d76a0d7d1c0cff1d9170ebf [diff] | |
| parent | e5f3f65827043ac7b32287a3371c33c9fb90d030 [diff] |
am e5f3f658: (-s ours) am 192a856d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e5f3f65827043ac7b32287a3371c33c9fb90d030': Import translations. DO NOT MERGE