| commit | 1eb767ff5e5079348dd452c77e921221b1d18e7a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 14:02:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 14:02:30 2015 +0000 |
| tree | e1d2a292a41ae8e91858b91b1730b36be9dc9f28 | |
| parent | 33ae80e35a1b170309999c9b33b310ca91eb3f05 [diff] | |
| parent | 6001319ae4eaad7ab9112b5c7cbb1659e1ec2e2b [diff] |
am 6001319a: (-s ours) am 7aaaacc1: (-s ours) Import translations. DO NOT MERGE * commit '6001319ae4eaad7ab9112b5c7cbb1659e1ec2e2b': Import translations. DO NOT MERGE