| commit | 0a5affed6e7ff29e19149c564cf07e8788fdd1fa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:25:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:25:49 2015 +0000 |
| tree | 7548d5892aafafdc75e30950b60969947cfa30e0 | |
| parent | db768c36c777cc9b97b52958e8f1b7632667e3fe [diff] | |
| parent | 12e5ae29dcb3f448b00d7dafcf7db30f91499b3c [diff] |
am 12e5ae29: (-s ours) am 430e13ea: (-s ours) am c7d8b5cd: (-s ours) Import translations. DO NOT MERGE * commit '12e5ae29dcb3f448b00d7dafcf7db30f91499b3c': Import translations. DO NOT MERGE