| commit | d993af4c231ba0b9fe71442d3faeb0d2ffbe80fa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 21 16:50:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 16:50:13 2014 +0000 |
| tree | 43fdd1a67d3a0161fea7fdb56f89accf1a1effac | |
| parent | a00494c0836ec2a5fa4ef0d801158af9800e1c7a [diff] | |
| parent | 0d284509b568082883a4ad8bb608c17c689e88f8 [diff] |
am c21e69b7: (-s ours) am b107b950: (-s ours) am 58dbd5e7: (-s ours) Import translations. DO NOT MERGE * commit 'c21e69b7b574bba0c7c8aec5a12522c67bad31d0': Import translations. DO NOT MERGE