tree b60f7c56e4427fbad556256ae9885539535c71c7
parent 542381305aa10cd0a44fc3796f06e71eebd68780
parent 25673cb22eb22712faa0515290a8ea929951c95a
author Geoff Mendal <mendal@google.com> 1454501522 +0000
committer android-build-merger <android-build-merger@google.com> 1454501522 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 52454ab476  -s ours
am: 25673cb22e  -s ours

* commit '25673cb22eb22712faa0515290a8ea929951c95a':
  Import translations. DO NOT MERGE