tree eafe87b1eb5f599a97c764db03bfae1e86cb4221
parent 1eb06eaaef5b56cd71a7cc7e9f5cd5d2b199f420
parent 2f8e387b01a7800486e362c71d1425366fd94a0c
author Geoff Mendal <mendal@google.com> 1438405923 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438405923 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev