| commit | db787cd10bd13943cd63d0d392d4ff266f5eef86 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:25:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:25:56 2015 +0000 |
| tree | ec2150fdaf0acacf4864a66b4e971b36963d0041 | |
| parent | f2ddc0d45503b12186e8380e20c6c712a307d3aa [diff] | |
| parent | 73caa1d8f95ddea6996f35332e125821cdfb1c91 [diff] |
am 73caa1d8: (-s ours) am 7b19bf7e: (-s ours) am e3470c6e: (-s ours) Import translations. DO NOT MERGE * commit '73caa1d8f95ddea6996f35332e125821cdfb1c91': Import translations. DO NOT MERGE