| commit | e889c4f33fc0552bf7675cd1300d9aa04d526d36 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:07:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:07:51 2015 +0000 |
| tree | 2502a323c2824f0820bfe40bd3a1d3c076341e0a | |
| parent | ee869d46c5273647a01e6e01bbc9b47717e54aa4 [diff] | |
| parent | acc2c10cf09e053275a86de8c8ba182d07b215bc [diff] |
am acc2c10c: (-s ours) am 1c316b44: (-s ours) Import translations. DO NOT MERGE * commit 'acc2c10cf09e053275a86de8c8ba182d07b215bc':