| commit | 096d1dcfb8f93af0398c94590203c7725dbda1df | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 19:06:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 19:06:45 2015 +0000 |
| tree | 299e1fe2084dc4eaa2bfb6f0c303459547884dde | |
| parent | 06e7f73bfea035bbd3356443d87f50f8de091d33 [diff] | |
| parent | b43a36c1f94975dd3ca567ecdf3ccbb9c3270d34 [diff] |
am 589c0c26: (-s ours) am 4356e281: (-s ours) Import translations. DO NOT MERGE * commit '589c0c2622d4279ba1926e4ff702ad8ea35ad324': Import translations. DO NOT MERGE