| commit | a4cf37c1b277b053aa135c257419cb139362e0d3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 01 17:24:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:24:24 2015 +0000 |
| tree | dc6d08fee59791e87f726bbddd16bfa4e9611b77 | |
| parent | cb63da5b24aa6dd5d04fbe571d514e074109ca78 [diff] | |
| parent | 6033950262f050d33e472dbf002296ddd97db649 [diff] |
am 60339502: (-s ours) am bd22190c: (-s ours) am ab9bca55: (-s ours) Import translations. DO NOT MERGE * commit '6033950262f050d33e472dbf002296ddd97db649': Import translations. DO NOT MERGE