tree f0d8068d020a667cf725aa079e010390c579db53
parent 94cf00bd8fcd304f5b3cb7f775c8f6ac5f91525a
parent 8c28b97fbca6f2eae0cc40c32f4d8f0ea15e36dd
author Geoff Mendal <mendal@google.com> 1454500324 +0000
committer android-build-merger <android-build-merger@google.com> 1454500324 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 8c28b97fbc  -s ours

* commit '8c28b97fbca6f2eae0cc40c32f4d8f0ea15e36dd':
  Import translations. DO NOT MERGE