tree 6d46ab9e6fad926fcc21fb3d47d2d171e401cd7f
parent f3fd6c0e1331529f5425276e9ac168e63bf78d8a
parent 5fcbc958254285b282b9eb735a01d81e7e94e669
author Geoff Mendal <mendal@google.com> 1447249326 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447249326 +0000

Merge "Import translations. DO NOT MERGE"