| commit | 5042a102bb4672a0c14d8d4b6a4c83eff14f7649 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri May 29 19:19:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 19:19:09 2015 +0000 |
| tree | 222bffc5fe743dd6be190d29bc55f900c21ee615 | |
| parent | 28b6e6d3df143ff274a8a347f5695cb73d17649f [diff] | |
| parent | 161c7011076457628553b27d6dca9c2e9f41b1ae [diff] |
am 161c7011: (-s ours) Import translations. DO NOT MERGE * commit '161c7011076457628553b27d6dca9c2e9f41b1ae': Import translations. DO NOT MERGE