tree f51ca00159714cfae6d4f6620076ea200e703288
parent a2de7f75ac137a54787670501ec130bdcfa2f2a9
parent 49871b5073cde1d8775ff876a65b38c8ccd9b145
author Geoff Mendal <mendal@google.com> 1436198579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436198579 +0000

am 49871b50: (-s ours) am 0dd06fd5: (-s ours) am 1e0ecf87: (-s ours) am 99f71e0f: (-s ours) am 0356bca6: (-s ours) Import translations. DO NOT MERGE

* commit '49871b5073cde1d8775ff876a65b38c8ccd9b145':
  Import translations. DO NOT MERGE