| commit | 82c45e07c2c6771142ad7b7dffaae23f9151d597 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Sep 30 13:08:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 13:08:11 2015 +0000 |
| tree | 4e8400a1a07b08c54552f30bfcde25a87ceda5d5 | |
| parent | a462b2862a8694ba76ea7ee9047eab5ce7a2f769 [diff] | |
| parent | 4446480e7f468afbc55fc3c18abb05ca77eb03be [diff] |
am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE * commit '4446480e7f468afbc55fc3c18abb05ca77eb03be': Import translations. DO NOT MERGE