am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 15 Nov 2011 22:34:52 +0000 (14:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Nov 2011 22:34:52 +0000 (14:34 -0800)
commit2334a1b5c24444365c31198d9bd2b1acae753178
tree2867f007dd3de64d1bbff59987e88eadfb779256
parentf9ea94dbeedcdd37895aced9c0578107e58c8ef3
parent0fe3c81d681ce35ef7506aa9d60d390305cad8be
am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE

* commit '0fe3c81d681ce35ef7506aa9d60d390305cad8be':
  Import revised translations. DO NOT MERGE