tree 4278ddf2da1f124e619daebaf220fb536d05a2a2
parent 72583a9c8c1d922d80e69d4218e51e641c068621
parent 99f712322b481bce390626621a2f95b73122811a
author Geoff Mendal <mendal@google.com> 1438177472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438177472 +0000

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

* commit 'ceada86c7087976b8a4823684926878bbec79137':
  Import translations. DO NOT MERGE