commit | 737e925cc889f211acbcf6c3ebfa91a9a6808cea | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Oct 21 16:58:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 16:58:26 2014 +0000 |
tree | ab80a847640bf3a301895ffcf479e798d1297120 | |
parent | 75ae16aedc9a2c70f83d6b2b5ba4c0b20e4fc186 [diff] | |
parent | d993af4c231ba0b9fe71442d3faeb0d2ffbe80fa [diff] |
am 14b97c35: (-s ours) am c21e69b7: (-s ours) am b107b950: (-s ours) am 58dbd5e7: (-s ours) Import translations. DO NOT MERGE * commit '14b97c35a0739b13d973c1c6e1fda566c9190628': Import translations. DO NOT MERGE