| commit | 428a4dcd33817bc7e0508cdf94cc35f451cc6ade | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <[email protected]> | Fri Feb 05 14:13:40 2010 -0800 |
| committer | Android Git Automerger <[email protected]> | Fri Feb 05 14:13:40 2010 -0800 |
| tree | 39066c4239256f93a219a2df751292f0db283bb8 | |
| parent | 7d35df9558f695ee7d6f4b0c9370dcb85be616c7 [diff] | |
| parent | 5b11918b7a4571dffdb94d76d9d03104e9830813 [diff] |
am 5b11918b: reconcile main tree with open-source eclair Merge commit '5b11918b7a4571dffdb94d76d9d03104e9830813' * commit '5b11918b7a4571dffdb94d76d9d03104e9830813': android-2.1_r1 snapshot eclair snapshot