tree 00ff2e534de9a41573e4a810f22b825529543913
parent 883f12ac5ac818e678af46b64a3f6e97b51caabe
parent 3ed855b01a829229aacf7250821913f6d77e47cf
author Geoff Mendal <mendal@google.com> 1448302087 +0000
committer android-build-merger <android-build-merger@google.com> 1448302087 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: d273c053ce  -s ours
am: 3ed855b01a  -s ours

* commit '3ed855b01a829229aacf7250821913f6d77e47cf':
  Import translations. DO NOT MERGE