| commit | 75ae16aedc9a2c70f83d6b2b5ba4c0b20e4fc186 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 21 16:58:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 16:58:25 2014 +0000 |
| tree | ab80a847640bf3a301895ffcf479e798d1297120 | |
| parent | 16c17e608d46b0927d55094751c603c6ac4b2e78 [diff] | |
| parent | a00494c0836ec2a5fa4ef0d801158af9800e1c7a [diff] |
am 918ec076: (-s ours) am f2f4244c: (-s ours) am 0f661f4b: (-s ours) Import translations. DO NOT MERGE * commit '918ec0764eeba03f87afbb2c316ccd28a4514f0c': Import translations. DO NOT MERGE