| commit | 223b9739a9debdbdfd2a4d3b42c66c36d04d21cd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 05 13:06:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 13:06:50 2015 +0000 |
| tree | 838e272e939b46eb3bcb26a7bda2db066a92cad0 | |
| parent | bcc5b07e99d6947ee4d0c9430899ce5485bcbaea [diff] | |
| parent | 37166a4cf69254d5993d25c4e2a446bb5555411e [diff] |
am 37166a4c: (-s ours) am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE * commit '37166a4cf69254d5993d25c4e2a446bb5555411e': Import translations. DO NOT MERGE