commit | d1548f3f1013d81e1dba90326413be3313a313e7 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:17 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:17 2015 +0000 |
tree | 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87 | |
parent | f4f5c5878cc5d7f4b0613056e9720121bb58c846 [diff] | |
parent | 91f683860a389b4bb02bcf86347228909229a6cb [diff] |
am 91f68386: (-s ours) am f5766c04: (-s ours) Import translations. DO NOT MERGE * commit '91f683860a389b4bb02bcf86347228909229a6cb':