tree 47bb055b6616b05a378bace902cefa18e570f464
parent 210f0afaf9011d044d261f1044a1a7368cb89e7e
parent 49eeda33ddca15ff8b8e820d1cf68a99cde9806a
author Geoff Mendal <mendal@google.com> 1447090045 +0000
committer android-build-merger <android-build-merger@google.com> 1447090045 +0000

Import translations. DO NOT MERGE
am: 49eeda33dd  -s ours

* commit '49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
  Import translations. DO NOT MERGE