tree 9a6acfd017475834be1dd6347125bcd02b21743a
parent cc075095c017a4ca2732266a4dfdc8d1c15a6da4
parent 4297acf5e81ce707c9849fb4ea9da7b4d34cbb20
author Geoff Mendal <mendal@google.com> 1458570402 +0000
committer android-build-merger <android-build-merger@google.com> 1458570402 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: d83aa19  -s ours
am: 4297acf  -s ours

* commit '4297acf5e81ce707c9849fb4ea9da7b4d34cbb20':
  Import translations. DO NOT MERGE