| commit | 4982f4f147c6b1b73173961397ca45b5cd846751 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 15 13:31:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 13:31:33 2015 +0000 |
| tree | 92bc87048e9fcb349f4be1f22f69258b589467b5 | |
| parent | 813c14ad84595066245a252cde9521a311758ca0 [diff] | |
| parent | 0c75d39e185d917f58a679f6ccca65484560dc30 [diff] |
am 3949d1e3: (-s ours) Import translations. DO NOT MERGE * commit '3949d1e3d78c163bb5ca9370c4bfe0d709eb87c9': Import translations. DO NOT MERGE