commit | 3e12ddd5101c3bdfb4271f26eb0cf6d8f92cf0b0 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:43:02 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:43:02 2014 +0000 |
tree | 24e99c8aed392b2cd57acfa1a33d57d0f42a2e1c | |
parent | f1467e776bbfe8ce2fe6cdb4aa1b3fcd954ceca5 [diff] | |
parent | eb5cbabbc6804abb11ff62784a36b908ec6cd48e [diff] |
am eb5cbabb: (-s ours) am 1315e68a: (-s ours) Import translations. DO NOT MERGE * commit 'eb5cbabbc6804abb11ff62784a36b908ec6cd48e': Import translations. DO NOT MERGE