tree f6ee54a469460fe01733de28745913cd2ab9e991
parent 34f10d9686aef09b2d6c5450afd80e81819f52c3
parent 6f3143de02258ebc784daecbb869c1569095789b
author Geoff Mendal <mendal@google.com> 1450275878 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450275878 +0000

Merge "Import translations. DO NOT MERGE"