tree 6426b4b1c2a5871cd6d86f747630b2c791db55c0
parent c03190a48ee2193b385ad066c768b3c2939c5ab8
parent 70c65879039b49983bb9b478128a5a683a4152c4
author Geoff Mendal <mendal@google.com> 1432214560 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1432214561 +0000

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