tree f16027c118b17ff680750d876012b663b5b2fe2d
parent c6b0b20624e5be8c6c84e0ba07e686e8212385cd
parent 1d1d42a2c145b940d86d8d3c7ef679055d72541d
author Geoff Mendal <mendal@google.com> 1436802231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436802231 +0000

am 1d1d42a2: (-s ours) am cf66f383: (-s ours) am fd4effa0: (-s ours) Import translations. DO NOT MERGE

* commit '1d1d42a2c145b940d86d8d3c7ef679055d72541d':
  Import translations. DO NOT MERGE