| commit | 384f0dc76e4901dfef76aec446afb0624b5e6c50 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:42:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:42:35 2015 +0000 |
| tree | b5054d3e3c26030a100911059710f60e068b6ed9 | |
| parent | bef1f2c57795126fb25f8c64528503639a3d01af [diff] | |
| parent | 5b88964e326df1ec3d4fd6e370a3e90f4465b164 [diff] |
am 5b88964e: (-s ours) am f54e6183: (-s ours) am 4c131aee: (-s ours) am 0b3c126d: (-s ours) Import translations. DO NOT MERGE * commit '5b88964e326df1ec3d4fd6e370a3e90f4465b164': Import translations. DO NOT MERGE