tree ad73ba4b9b3b27d821dae6afdabeb7111e6e7007
parent edba1fb56ef41a4a7394d4169a53a1713fa7779f
parent 8d3aaaca5f10dd6c7eeba40ea21326dbb0d91116
author Eric Fischer <enf@google.com> 1316818015 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316818015 -0700

am 8d3aaaca: (-s ours) am f9e385f3: (-s ours) Import revised translations.  DO NOT MERGE

* commit '8d3aaaca5f10dd6c7eeba40ea21326dbb0d91116':
  Import revised translations.  DO NOT MERGE