| commit | bee01e69f0fcc149d1d60f565dc928020b0cfadd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 10 15:06:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 15:06:39 2015 +0000 |
| tree | 00904f1331b51484bd409d98549830bfb5522bca | |
| parent | 6e617e312eaf3b90b62088ccc5feb556bbafbd1a [diff] | |
| parent | 3af90f14f6fe7c1e37c1735fb0050a4ef62afeb0 [diff] |
am 3af90f14: (-s ours) am 50860669: (-s ours) Import translations. DO NOT MERGE * commit '3af90f14f6fe7c1e37c1735fb0050a4ef62afeb0': Import translations. DO NOT MERGE