| commit | 8ba45cf9000fb7a6922db8e094ac6a84cedce184 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 05 12:58:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 12:58:40 2015 +0000 |
| tree | e0530c1bf991f9e17f9a88e0937d8bd747d52a09 | |
| parent | ef9d636376bda7bd64e55022ad3d734e6ee5dbd7 [diff] | |
| parent | 41301f1806782a607377e341e86f05dbeaf8a6b9 [diff] |
am 41301f18: (-s ours) am 404d21fa: (-s ours) am bcc5b07e: (-s ours) am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE * commit '41301f1806782a607377e341e86f05dbeaf8a6b9': Import translations. DO NOT MERGE