tree 3cdbf3b2b877a494ef6136b3cfef146419363f1c
parent c8d5b243f109897537150b7f240a658ee8fdf7fe
parent 9735cbd1e37398ed24267bdb43570f28b810572e
author Geoff Mendal <mendal@google.com> 1413226354 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413226354 +0000

am 9735cbd1: (-s ours) am 29be6698: (-s ours) Import translations. DO NOT MERGE

* commit '9735cbd1e37398ed24267bdb43570f28b810572e':
  Import translations. DO NOT MERGE