commit | 08ee18d43de37dc84858da02601fec742b40e477 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:44:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:44:00 2014 +0000 |
tree | 26e784eeea279cbc38d668de062ce00d83ac1891 | |
parent | eb5cbabbc6804abb11ff62784a36b908ec6cd48e [diff] | |
parent | 4aaca3d7189878e7c356e871672056e9f8ab3231 [diff] |
am 4aaca3d7: (-s ours) am b7627801: (-s ours) Import translations. DO NOT MERGE * commit '4aaca3d7189878e7c356e871672056e9f8ab3231': Import translations. DO NOT MERGE