am 2334a1b5: am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO...
authorEric Fischer <enf@google.com>
Tue, 15 Nov 2011 22:37:09 +0000 (14:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Nov 2011 22:37:09 +0000 (14:37 -0800)
commit8f8f6c0a395f7f4c6e1919f4c4173ad43598c988
tree2867f007dd3de64d1bbff59987e88eadfb779256
parentb1c7bb5c459c5a2717070a97fd35b20867a2985a
parent2334a1b5c24444365c31198d9bd2b1acae753178
am 2334a1b5: am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE

* commit '2334a1b5c24444365c31198d9bd2b1acae753178':
  Import revised translations. DO NOT MERGE