tree f951c975eb2392551ddc0eecc2212fd7b65d1df0
parent 48def6ea188c4e2cfc75a63212507396fdc81d2d
parent 05ffc7265bfca0810d03177d61f7c1bb6bd39ecb
author Geoff Mendal <mendal@google.com> 1436802934 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436802934 +0000

am 05ffc726: (-s ours) am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE

* commit '05ffc7265bfca0810d03177d61f7c1bb6bd39ecb':
  Import translations. DO NOT MERGE