am 6d83de80: (-s ours) am ffc848ef: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '6d83de804884b0d0e97a2d5fd5ddab88213d5d66': Import revised translations. DO NOT MERGE
This commit is contained in: