tree 74adecd69934c3deb5dcfd3318b05d779256571d
parent b4cc39dba95bb0d3cf74f934ca71d630a1f15cac
parent 31aa2c3a95bf016afb90324388f7a67c74360679
author Geoff Mendal <mendal@google.com> 1424998230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424998230 +0000

am 31aa2c3a: (-s ours) am 727f8d40: (-s ours) Import translations. DO NOT MERGE

* commit '31aa2c3a95bf016afb90324388f7a67c74360679':
  Import translations. DO NOT MERGE