| commit | e7be66e5e5843e6e2fc5c6a381443d18104ac148 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 22 11:24:36 2009 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 22 11:24:36 2009 -0700 |
| tree | b7a3cd2bd1a437237e71598d05b88be3f681c610 | |
| parent | 0931989f0bae4ffe1e3f8fe1c121029c7a65d9de [diff] | |
| parent | 840964f714166462444c17a424032864aa90e1e9 [diff] |
merge f41c640d8424fbd90cb1751173ede1c9f5e848b4 w/minor conflict