| commit | e0f32ca9fbab842d4608d4813286267ef8b2e5c4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Mar 20 23:12:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:49 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 6f993332757b5abe06006afbd3eaf81abeae00da [diff] | |
| parent | 4fabf2ae7845b2151b24d62f6d8c10bd2d70cc3c [diff] |
am 4fabf2ae: (-s ours) am 16a72091: (-s ours) am c85068fb: (-s ours) Import translations. DO NOT MERGE * commit '4fabf2ae7845b2151b24d62f6d8c10bd2d70cc3c':