tree a2a4fb4ff8b717cf27b38a683ab03ab87475295e
parent 412fee5913819d2d2a342ceb0625feefadeb5d5d
parent ee94a864c91f9856135a8a0173f9b9877eb85043
author Geoff Mendal <mendal@google.com> 1431585584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431585584 +0000

am 27c0e552: (-s ours) am f7de378d: (-s ours) Import translations. DO NOT MERGE

* commit '27c0e5520a779e6184bbc6db19a01b2ae0b1237d':
  Import translations. DO NOT MERGE