am 8c111043: 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 '8c111043b8e08d3b058f7508d23b5e6c078c7534':
  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:07:20 -08:00 committed by Android Git Automerger
commit 062168b625

Diff Content Not Available