| commit | 8c111043b8e08d3b058f7508d23b5e6c078c7534 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Wed Jan 11 16:04:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 11 16:04:56 2012 -0800 |
| tree | 541af942413ca0e97e7c5fd70cc42bd5d98bb7be | |
| parent | e895db8ff636c6c32671f07d04b81b0663ed2cf1 [diff] | |
| parent | ed043c61eae95a9476a233d88f058ea0c163cfcb [diff] |
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.