tree 9eca3c53d0763dc2560027baf0a2061bd049f1ba
parent 604eae220d5a25a5c3a616790d0e309fdadbdf90
parent 13da3efb7ad2100f8d1263fa8f13a21691b86501
author Geoff Mendal <mendal@google.com> 1439820833 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439820833 +0000

am 13da3efb: (-s ours) Import translations. DO NOT MERGE

* commit '13da3efb7ad2100f8d1263fa8f13a21691b86501':
  Import translations. DO NOT MERGE