| commit | dd019240ce0b01aac32a6ec4a1170106f0433de1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:05:12 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:05:12 2013 -0800 |
| tree | 3c042a5de95c0fb1930c7bfb1d75d8371f160fc9 | |
| parent | e26d7b927d184ade89eddf7c348aa84abc179476 [diff] | |
| parent | 76d46fa98f1a2363165b7e5534f6dbdf23908351 [diff] |
am cab0818e: (-s ours) am 72b9f6eb: (-s ours) am a0a1b7f2: (-s ours) am dc42c227: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'cab0818ed948a3872f2289a1bff22cb8abf81975': Import translations. DO NOT MERGE