Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
authorGeoff Mendal <mendal@google.com>
Tue, 2 Feb 2016 16:50:12 +0000 (16:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Feb 2016 16:50:12 +0000 (16:50 +0000)
commitb5d459abb522571a5feab1da879c93a2e223db18
tree638c6f7b158ba2c1d10630abbb958d7af1a50944
parenta829521e3c385f441e5c805b0868a9eb45b89b39
parentdcd74a8a549ee25bc4dc9730ba660096e7d88d40
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: dcd74a8a54  -s ours

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