| commit | 61de63296e9e32bb086f1bea4dd2cb2e5cdc3f81 | [log] [tgz] |
|---|---|---|
| author | Dan Egnor <egnor@google.com> | Tue Nov 24 17:41:29 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 24 17:41:29 2009 -0800 |
| tree | b7ec2cd6b1dc1e68c9ae1f2e6328fb03ac0a932e | |
| parent | 06d940ef604de70e8616dd1d7e4c9289dd6072ab [diff] | |
| parent | 5a3162ab80873476b63d1fcfe7288916995e6386 [diff] |
am 1ffa3c01: am ee6c7e49: Merge change I2c5380a6 into eclair-mr2 Merge commit '1ffa3c01a90f7e85aacb77163464b689d68f44cd' * commit '1ffa3c01a90f7e85aacb77163464b689d68f44cd': Fix a bug in the Settings contract class (introduced in an ... iffy ... fix