tree 082f5ebef6d4e6e6dccb33ed473c180a9987949a
parent d47807d7a97d4ab555b2f9be882591c08955d699
parent 53d3be63a5ab056280279bcb13089faae0e7796f
author Geoff Mendal <mendal@google.com> 1444166130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444166130 +0000

am 53d3be63: (-s ours) Import translations. DO NOT MERGE

* commit '53d3be63a5ab056280279bcb13089faae0e7796f':
  Import translations. DO NOT MERGE