| commit | 7bca5c4e8f2dba3f681d2f5bf6187d51fe17582a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 04 16:08:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 04 16:08:55 2014 +0000 |
| tree | 539753b5b95a3af7c2a5b822d1afd35ce9dbbe97 | |
| parent | bd3c293442ad707fb914f919d4f8585d2ecd370a [diff] | |
| parent | 08b3171d1000304139d337a365fa203ec6178f1b [diff] |
am 41ccaee0: (-s ours) am 0ef35074: (-s ours) am f12c6aeb: (-s ours) Import translations. DO NOT MERGE * commit '41ccaee05a0496e174caf414d70a9df612045777': Import translations. DO NOT MERGE