tree 99c83bb8b32f3abed6b28042a95446f76ceff6ca
parent 3b05d2bd6fe7a674537dc87aade5673746c96780
parent fa89d0dc40ee5b1dd1f9cb697a52650ba231134f
author Geoff Mendal <mendal@google.com> 1417671897 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417671899 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev