commit | a01dc0fc59fb7a7c4fd33533ec47069268b70863 | [log] [tgz] |
---|---|---|
author | Mike Reed <reed@google.com> | Thu Oct 29 01:20:26 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 29 01:20:26 2009 -0700 |
tree | 61412a0c6f2f7f4598956d9b264c80b4368f0785 | |
parent | 40946aa20183984fd60f2dbdc7708cf1c5431047 [diff] | |
parent | 2dfaa698012b36d83e342b5ef1e88734dfbcac80 [diff] |
am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair Merge commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-mr2 * commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80': do not merge