tree bfcd34d077ce708764f7a6dbf865b5d4cb460d69
parent 8e136eb58fe31c37c86a9e9ab197cc5b7b7a0668
parent bff2c12ae6ec7384b1f999e6c3d8533fce617992
author Geoff Mendal <mendal@google.com> 1439816888 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439816888 +0000

am 6702954c: (-s ours) am 549c2a30: (-s ours) Import translations. DO NOT MERGE

* commit '6702954cf569f84b92931f1cefb4627c4d3cf5e4':
  Import translations. DO NOT MERGE