am cafcbc34: (-s ours) am c3405f8a: am 67b2bc57: am e5c271f5: (-s ours) Import revise...
authorEric Fischer <enf@google.com>
Tue, 29 Mar 2011 23:58:37 +0000 (16:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Mar 2011 23:58:37 +0000 (16:58 -0700)
commit21775dca6a8d39c2d46532a43d01fcfce795a2f2
tree1f537540775f899946e3d1e89d0631b2aa97c520
parentf32e29e2c1c7ef26d7b3e02268b365ea5bb6a578
parentcafcbc3424489c479145bb9c5bc6e5b5a7990144
am cafcbc34: (-s ours) am c3405f8a: am 67b2bc57: am e5c271f5: (-s ours) Import revised translations.  DO NOT MERGE

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