| commit | bbcba8f1bca4d5d28aa239e54edc269f03edb4ba | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:25:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:25:44 2015 +0000 |
| tree | fa31eb3b80386d52c9bd642232c969c1a80180de | |
| parent | db369d427605ed0fb058c7b7e8e3dbe9cc93d688 [diff] | |
| parent | 97ac5b3963fdefe93dd233754b9f9612a21ca1a9 [diff] |
am a531220f: (-s ours) am a3d5eeda: (-s ours) am 1f19a311: (-s ours) Import translations. DO NOT MERGE * commit 'a531220f8738b6b4c257f067fa439315a479be45': Import translations. DO NOT MERGE