| commit | 5d351f57563d37181896b01959b718d0e870a753 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 22 07:48:37 2009 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 22 07:48:37 2009 -0700 |
| tree | b7a3cd2bd1a437237e71598d05b88be3f681c610 | |
| parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 [diff] | |
| parent | fa33ce45daa1fcb044a15aaa7a9d28a193f62b94 [diff] |
merge 84ce47e64f9aa5600b6b3e205f8c6930a8095c7d w/minor conflicts