| commit | e1c14bf5ebc0f542a54c834162d8fee641ab536c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jun 23 19:50:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:50:07 2014 +0000 |
| tree | b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60 | |
| parent | eb30c8e031358c20cac4a973963166be8e0e4119 [diff] | |
| parent | 535efff41e7b24c7278777c3e64405da8b25eb74 [diff] |
am 535efff4: (-s ours) am 78ba442e: (-s ours) am 3a50b9e1: (-s ours) am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE * commit '535efff41e7b24c7278777c3e64405da8b25eb74':