| commit | b62d31aa84e6d115babb85c61f7ba543bd4546ef | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:43 2015 +0000 |
| tree | a338fc515b7817f1306a79dd4886a8e851fe8deb | |
| parent | 7176ebe97edcd6085400156fead4291a6f9fc3d7 [diff] | |
| parent | 8442ad1967c76b68805d39184444901472c2d22c [diff] |
am 498d6802: (-s ours) am 34376003: (-s ours) Import translations. DO NOT MERGE * commit '498d6802bd99e03a252ef710fcd22e6d4daf60df':