commit | a4b8a30ccb3669eaa13eb848b59f6c3faa12b282 | [log] [tgz] |
---|---|---|
author | Daisuke Miyakawa <dmiyakawa@google.com> | Wed Nov 11 17:25:42 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 11 17:25:42 2009 -0800 |
tree | 57207a7a1af59ae443c0981b206fd635d0968d87 | |
parent | 7efa671569955aead877d10e7d6b1fa3129184a4 [diff] | |
parent | 49fc4a9dd39e520d87fd2b9f1a20263570221ebe [diff] |
am 49fc4a9d: am fe17db4c: (-s ours) Merge change I4db11d50 into eclair Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp * commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe': Backport the change I30b141a2 from MR2 to MR1. Do not merge.