tree 78096c41d1d3df1f619f69c6d1461911026f2d5d
parent 156b98b63439db17cbfed90577eae870e69cf95f
parent 25005bf522a9a4297de6c8d3c656fcfe7ad2c60d
author Eric Fischer <enf@google.com> 1338852595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338852595 -0700

am 25005bf5: Import translations. DO NOT MERGE

* commit '25005bf522a9a4297de6c8d3c656fcfe7ad2c60d':
  Import translations. DO NOT MERGE