tree c13b3a1fd0e163eddc8e26f1c1f915c8b5f19dc4
parent b48cb0933dc6e807da104f5598aba48b5cfa439b
parent 98ecae985df4899a4ef92b08bb332343d2b7cdc0
author Eric Fischer <enf@google.com> 1301443130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301443130 -0700

am 98ecae98: (-s ours) am 8e3b835d: am 3c32f5f3: (-s ours) Import revised translations.  DO NOT MERGE

* commit '98ecae985df4899a4ef92b08bb332343d2b7cdc0':
  Import revised translations.  DO NOT MERGE