| commit | d1ba8f73cebeedf4da291db868afddd34ba94092 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:30:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:30:14 2015 +0000 |
| tree | 890aa3045c01df67feb22771fe54268fc58dda88 | |
| parent | c16b10ea6bc544c3707adfada28b68c98aea5bb4 [diff] | |
| parent | c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91 [diff] |
am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE * commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91': Import translations. DO NOT MERGE