Import translations. DO NOT MERGE am: b24f46b8ae -s ours am: 8a199896cb -s ours
authorGeoff Mendal <mendal@google.com>
Tue, 2 Feb 2016 16:54:23 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Feb 2016 16:54:23 +0000 (16:54 +0000)
commita02d0d58368bf59afde7f3a2b7349f5b29872ac3
tree1ce7b621f8ffd58831aedd82c2c34da64aa7dca9
parentb6b513c1ed46567192930b2abc99a2de2101be5c
parenta829521e3c385f441e5c805b0868a9eb45b89b39
Import translations. DO NOT MERGE am: b24f46b8ae  -s ours am: 8a199896cb  -s ours
am: a829521e3c  -s ours

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