tree 302a96c9560fe07b5635a93aaf3923cd27bf6a51
parent ba51f87bd014631b2040488ede605c4f593b492e
parent e4c3e1af3b2cefc64bd4e52c4426ef1a31e1c194
author Geoff Mendal <mendal@google.com> 1450102545 -0800
committer android-build-merger <android-build-merger@google.com> 1450102545 -0800

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

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