tree 5b25fa857a93f3cf3547f856abb61f3ce5274e6c
parent 73dedf661e8fb6ab77552a715f202dd6c602ddc5
parent 812794f0f5dfba607bcdd648611317df10ca0d49
author Geoff Mendal <mendal@google.com> 1447801377 +0000
committer android-build-merger <android-build-merger@google.com> 1447801377 +0000

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

* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
  Import translations. DO NOT MERGE