| commit | 4cd88420660559c8881cfe3d5ac58ca45e33a083 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:00:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:00:19 2015 +0000 |
| tree | 9353d43b0d68bed46e13c655ebf88d637d52f0f1 | |
| parent | 10f597e84b16961c9ad5d89427cb2432b6ab4016 [diff] | |
| parent | 692f3a962dc3adc216fc1ac2ca63ea88206f4a19 [diff] |
am 692f3a96: (-s ours) am 61f048a4: (-s ours) Import translations. DO NOT MERGE * commit '692f3a962dc3adc216fc1ac2ca63ea88206f4a19': Import translations. DO NOT MERGE