tree b93548f6698b0fd09774c0c0b4ee3ac070f2bee5
parent 808ba3dd1b0b2cae7e54e8eee5228cd3b2b6de56
parent 60197ff979e45e65e6a44cec595dbb22a978ada4
author Geoff Mendal <mendal@google.com> 1421782787 +0000
committer android-build-merger <android-build-merger@google.com> 1421782787 +0000

Import translations. DO NOT MERGE
automerge: 60197ff  -s ours

* commit '60197ff979e45e65e6a44cec595dbb22a978ada4':
  Import translations. DO NOT MERGE