| commit | 12e5ae29dcb3f448b00d7dafcf7db30f91499b3c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:13:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:13:51 2015 +0000 |
| tree | 1e4c8e0dcb2f4c07cc6adc59701531549861f59e | |
| parent | 0694df9373fa1c4f7cc6e721dd24f6626667424b [diff] | |
| parent | 430e13eaeaf9cf244ee65070cc75e129dfbf087e [diff] |
am 430e13ea: (-s ours) am c7d8b5cd: (-s ours) Import translations. DO NOT MERGE * commit '430e13eaeaf9cf244ee65070cc75e129dfbf087e': Import translations. DO NOT MERGE