| commit | d610e69b7da820167e627d49bd016ffe062241f4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 21 12:59:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 12:59:37 2015 +0000 |
| tree | 2080a16d264010c9ded27a2d581841a1e2fc3a7f | |
| parent | a264f0860367593a481c4c0a8677378349ee729b [diff] | |
| parent | 9c64d6b5c03b89b4e8b8d47753899614e3a8574b [diff] |
am 9c64d6b5: (-s ours) Import translations. DO NOT MERGE * commit '9c64d6b5c03b89b4e8b8d47753899614e3a8574b': Import translations. DO NOT MERGE