| commit | 12c4b02b36ce9d92b868ec2e92038730fe096999 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:03:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:03:12 2015 +0000 |
| tree | 9cd106170b43fa416d3745096d84141048251033 | |
| parent | 4f1e51fe2b0c8236ec71f5adfc10513b2a8e36b7 [diff] | |
| parent | 818b47a916ad2d170c350fe5bf533365b7d9eb5f [diff] |
am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGE * commit '818b47a916ad2d170c350fe5bf533365b7d9eb5f': Import translations. DO NOT MERGE