tree ccdc184780959c01f3e3c6f689bbcc008344d165
parent d534b936d70cd45d7dffd623ca16ec9b7fdbcbe2
parent 1d593ad47470150f751cc573eb56dae97470cf41
author Geoff Mendal <mendal@google.com> 1412641911 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412641911 +0000

am 1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '1d593ad47470150f751cc573eb56dae97470cf41':
  Import translations. DO NOT MERGE