commit | 10f209cc8fd4a4a83ea3e2fb9da964a01c8e7c79 | [log] [tgz] |
---|---|---|
author | Jianhong Jiang <jianhong@google.com> | Tue Nov 03 12:31:01 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 03 12:31:01 2009 -0800 |
tree | 7ca66ec303d02fac1137b5a948f1dc967a2b14ae | |
parent | e542e03d102bca1057e7718f74de9ed367831e36 [diff] | |
parent | f278fef2c7c4c802c1e18af4daafacfcc46ac3ae [diff] |
am f278fef2: (-s ours) Merge change I7c40cce5 into eclair Merge commit 'f278fef2c7c4c802c1e18af4daafacfcc46ac3ae' into eclair-mr2 * commit 'f278fef2c7c4c802c1e18af4daafacfcc46ac3ae': DO NOT MERGE TO MR2