| commit | 38e264915c97c6bbb9f04b3250bc26e4c6294002 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 12 11:14:35 2009 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 12 11:14:35 2009 -0700 |
| tree | e46aa467072c42269adfb9fc8598cd6c0d9d40f2 | |
| parent | 7490e4b170c7ca98146771ba72aab94131c33844 [diff] | |
| parent | 2cf6cff71f36b76e816a7a90c66f4b04c71e8278 [diff] |
merged 2cf6cff71f36b76e816a7a90c66f4b04c71e8278 w/minor conflict