| commit | fdf2454db21284b5e1ec23cb18724388c85fd975 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:30:10 2010 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:30:10 2010 -0700 |
| tree | 779330e312918811d802159156c45e9b170e16d9 | |
| parent | 4aef0ae660e81ca151a04ce0ddaf956275c70116 [diff] | |
| parent | 1297428e89ead45849068989d334d8b7eae2f602 [diff] |
merge from open-source master Change-Id: I9c926a3cd680a96ece026cdec71c6e0fb0b7ad7c