commit | 3587f3d1bbd8c0ea525d216bd1c37ab948493671 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Mon Jan 25 09:09:23 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 09:09:23 2010 -0800 |
tree | bfbcb5cc09d7bbed0d3a5d9e8888c3f254cb558d | |
parent | 4691219ce55cddeab29a277da02eb1540f501ba4 [diff] | |
parent | 6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7 [diff] |
am 6795dd59: (-s ours) am 359b2bcc: Check in translations for new Settings strings. DO NOT MERGE Merge commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7' * commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7': Check in translations for new Settings strings. DO NOT MERGE