| commit | 95679440a76b8e24a91bec58549d5fa436f8fabc | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:39:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:39:58 2014 +0000 |
| tree | 6543d28ebca86f49937beeabce59a026ef103e23 | |
| parent | 16bee088e72c8778ccc38a2370720188d9925463 [diff] | |
| parent | 29d415f2a779aa3340c82ece93fa7a10fd3832c7 [diff] |
am 29d415f2: (-s ours) am 8fb9deac: (-s ours) am df0b8ec1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '29d415f2a779aa3340c82ece93fa7a10fd3832c7': Import translations. DO NOT MERGE