tree f0bf8dd51fdf5e837a9602c8a2890cb10fe52956
parent 7631697793a8b82bb2a1cd3adced1b140d266427
parent 4ad2b0c829abaac84631c7f22fb159c1f892f5a5
author Geoff Mendal <mendal@google.com> 1433796781 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433796783 +0000

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