| commit | ba1e78b3a050604a4bac56659dacc5a946e98539 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 10 22:29:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 22:29:56 2014 +0000 |
| tree | 4bbaabe738148bbcf83d577e7677a29bb5133be5 | |
| parent | f23edeed7bb99d38abbe19d54a4d8c72c564f4e2 [diff] | |
| parent | 36de93fa3dca2a435b873488e03513fa8eb82633 [diff] |
am 36de93fa: (-s ours) am 9e343d6c: (-s ours) Import translations. DO NOT MERGE * commit '36de93fa3dca2a435b873488e03513fa8eb82633': Import translations. DO NOT MERGE