tree fe130f600034b3c599f821420edd07b52f5ceae4
parent 694a55b67ba865e48b8b0e281d64ab63145abdae
parent f1facef1fb3ece372398e765f2a717ec370c2853
author Geoff Mendal <mendal@google.com> 1430099556 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1430099557 +0000

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