| commit | 46ce534894cdb8eab7f69988882be751ebfba39c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:43:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:43:57 2015 +0000 |
| tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
| parent | 82df3a03fd954fd9b1cca1fb7dc2a0ed415b791b [diff] | |
| parent | bb744789fb648a1c6ff531d9911a16408032a335 [diff] |
am bb744789: (-s ours) am 6553dd6e: (-s ours) am b9e4739a: (-s ours) Import translations. DO NOT MERGE * commit 'bb744789fb648a1c6ff531d9911a16408032a335': Import translations. DO NOT MERGE