commit | 1cfc1fb385ba033707a2e0793f4ab3ec7d8aed2e | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <robdroid@android.com> | Tue Dec 08 14:50:31 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 08 14:50:31 2009 -0800 |
tree | 512375e20ce13d30c1f810d154b357760a62fb83 | |
parent | 7b94457311d7af16ac554085f074a373f0027f64 [diff] | |
parent | dbf68aa372078f4f55a267e1eb182dd360384467 [diff] |
am dbf68aa3: (-s ours) am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair Merge commit 'dbf68aa372078f4f55a267e1eb182dd360384467' * commit 'dbf68aa372078f4f55a267e1eb182dd360384467': DO NOT MERGE Reverting change I53e91db7.