tree b437c21e55940c897f0720d38b2d85572ba78926
parent b0819373e08e27578d14799ede8f3a08119b60a0
parent 5d935e827114b08788f52e3574d32a57e0ed6f9b
author Geoff Mendal <mendal@google.com> 1436190708 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436190710 +0000

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