am ed043c61: (-s ours) am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1

* commit 'ed043c61eae95a9476a233d88f058ea0c163cfcb':
  DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well.
main
Ken Wakasa 2012-01-11 16:04:56 -08:00 committed by Android Git Automerger
commit 8c111043b8

Diff Content Not Available