| commit | 634925222ad4528984bf35b9b2316db9a227d51c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 14 16:32:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 16:32:05 2014 +0000 |
| tree | 9f6d42dbd6595f84136d9af652c7ce314e0e748c | |
| parent | f29a4981616c05f300b582eb09d48ed81c97dd37 [diff] | |
| parent | 46bfaa1b93068c78ea5a2ab337ea8b98592b7c10 [diff] |
am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '46bfaa1b93068c78ea5a2ab337ea8b98592b7c10': Import translations. DO NOT MERGE