tree e14b5bb3fe117a2d95a8c52e8ef6a0050f4a8682
parent 34affa2303e959275eb66d91e2a416d7a69fc520
parent dd6e3529e43569e8161ad50e53616f8b7105725f
author Geoff Mendal <mendal@google.com> 1454448327 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454448327 +0000

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