tree bd5e8e6a5c6895a9563d956525284170ef923b78
parent 238c892ece3c945c5ed14bc6e522be12848874ed
parent ec04edca161acd8fe2d1e0d82be1cf77c2729da0
author Jean-Baptiste Queru <jbq@google.com> 1352418224 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352418224 -0800

am ec04edca: Merge commit \'658e350d\' into HEAD

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