| commit | 67143861b53e4bface2ffa097021a2d43b055b56 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 15:45:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 15:45:09 2014 +0000 |
| tree | c380264f3aa95e3e2385a5eeb8abe1d8072db709 | |
| parent | 4dcf2c1c9b292d671a0ed86e66b21f1777abc708 [diff] | |
| parent | 1ccebc378acc8c1f7a37da512d3b56068c4e89bf [diff] |
am 1ccebc37: (-s ours) am 734963ab: (-s ours) Import translations. DO NOT MERGE * commit '1ccebc378acc8c1f7a37da512d3b56068c4e89bf': Import translations. DO NOT MERGE