tree 05178a81061b55b44c37550f7ad31c9030da6810
parent 4b66f74aaec86f2719ebd6f4a6d396ecee0540a2
parent d273c053ce85585d223d152bacf6e9e4c6859d1e
author Geoff Mendal <mendal@google.com> 1448301501 +0000
committer android-build-merger <android-build-merger@google.com> 1448301501 +0000

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

* commit 'd273c053ce85585d223d152bacf6e9e4c6859d1e':
  Import translations. DO NOT MERGE