| commit | fdc2de4bdcc687c776b4da40d68964444c6a30eb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:04 2015 +0000 |
| tree | 08e3dd5170f0b186b89b95c00dfd115e2a458b00 | |
| parent | 1bd69ef93c0182206513631c6ac4ecb9b6db1069 [diff] | |
| parent | a7429d23ae539bd8932271e37b4cd52e7d7ed248 [diff] |
am a7429d23: (-s ours) am f67c3643: (-s ours) am cd4919b8: (-s ours) Import translations. DO NOT MERGE * commit 'a7429d23ae539bd8932271e37b4cd52e7d7ed248': Import translations. DO NOT MERGE