| commit | cfec547a42db55ba7c7c88d959f7f9f249ca0661 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 13:25:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 13:25:54 2015 +0000 |
| tree | 0f550deef429add26bf3259e5fae393cdb6e3048 | |
| parent | 870ba70288fe4a5a7f9e23631faa7379573ae506 [diff] | |
| parent | dbad1a72565779472fb88d7dec994dcf0629414e [diff] |
am dbad1a72: (-s ours) am 341e4d23: (-s ours) Import translations. DO NOT MERGE * commit 'dbad1a72565779472fb88d7dec994dcf0629414e': Import translations. DO NOT MERGE