tree f5693eacfc69f37081af6efec668d8b436781ef4
parent af1c75f78b6ba44478e49f384288ca1e27c546dc
parent d2a58e88f02ad7fb5cad941a558f320dc83b34c8
author Eric Fischer <enf@google.com> 1258163896 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258163896 -0800

am d2a58e88: (-s ours) am c9458a1b: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'd2a58e88f02ad7fb5cad941a558f320dc83b34c8'

* commit 'd2a58e88f02ad7fb5cad941a558f320dc83b34c8':
  Import revised translations.  DO NOT MERGE