tree d8e1551af7f525c772cdde483f521a399a8dc17a
parent 76a07888794370042ea63c0a8000cbb63fe27e73
parent 7c366c7dbf2dd0d21730445c8e7d9e382c8bbaca
author Geoff Mendal <mendal@google.com> 1407243997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407243997 +0000

am 7c366c7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7c366c7dbf2dd0d21730445c8e7d9e382c8bbaca':
  Import translations. DO NOT MERGE