Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: dcd74a8a54 -s ours
authorGeoff Mendal <mendal@google.com>
Tue, 2 Feb 2016 16:54:29 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Feb 2016 16:54:29 +0000 (16:54 +0000)
commit139179396f7c9bc94c67d45cd93c82bc56b6cae2
tree1ce7b621f8ffd58831aedd82c2c34da64aa7dca9
parenta02d0d58368bf59afde7f3a2b7349f5b29872ac3
parentb5d459abb522571a5feab1da879c93a2e223db18
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: dcd74a8a54  -s ours
am: b5d459abb5  -s ours

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