am c0906230: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'c0906230013ec3788f0013f8b53f9732f866ff69': Import revised translations. DO NOT MERGE
This commit is contained in: