| commit | 628cb28eaeafaaea63eaea02fae577a75ed693e5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 18:26:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 18:26:48 2015 +0000 |
| tree | d393e99c017f644adab5e578783b78fba0998340 | |
| parent | 313a93179f1e553e4e6e6589ca7d0d9c6e731dbc [diff] | |
| parent | ca3cca9418ae73fe894a9ae980f3d4622e4505c3 [diff] |
am ca3cca94: (-s ours) am 6a7bcb91: (-s ours) am f1d86ef7: (-s ours) am 7db61d06: (-s ours) am c362ec4b: (-s ours) Import translations. DO NOT MERGE * commit 'ca3cca9418ae73fe894a9ae980f3d4622e4505c3': Import translations. DO NOT MERGE