| commit | 41d4f5fc9ca455c5e4e13c1c603d5c6d10c6eca2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:45:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:45:07 2015 +0000 |
| tree | 85bc1179c29c882d4aa07d75f1a9fa67a762f174 | |
| parent | f92ab6f470a285309e7e1b108e1fa0b00c381879 [diff] | |
| parent | 12627349a08a5fec9b2d660ca642874c4bf1bbac [diff] |
am 12627349: (-s ours) Import translations. DO NOT MERGE * commit '12627349a08a5fec9b2d660ca642874c4bf1bbac': Import translations. DO NOT MERGE