tree e23d4e0b68453a25ea3000b165c48de5da293f95
parent fe17d79173e753b6b2752c1a806a6f97a59f35b8
parent 999576d050376f6b3e78827f9a0353b376ace1e4
author Geoff Mendal <mendal@google.com> 1440889791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440889791 +0000

am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE

* commit '999576d050376f6b3e78827f9a0353b376ace1e4':
  Import translations. DO NOT MERGE