Import translations. DO NOT MERGE am: b24f46b8ae -s ours
authorGeoff Mendal <mendal@google.com>
Tue, 2 Feb 2016 16:50:08 +0000 (16:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Feb 2016 16:50:08 +0000 (16:50 +0000)
commita829521e3c385f441e5c805b0868a9eb45b89b39
tree638c6f7b158ba2c1d10630abbb958d7af1a50944
parent15185cff911670eba8f742fe8a2f26de5ed657fe
parent8a199896cb9c78adc2cf04082ff7ba42a8b3966a
Import translations. DO NOT MERGE am: b24f46b8ae  -s ours
am: 8a199896cb  -s ours

* commit '8a199896cb9c78adc2cf04082ff7ba42a8b3966a':
  Import translations. DO NOT MERGE