| commit | 4c5355883575b89bc847b5b2dbc32064420335f2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 15:04:52 2010 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 15:04:52 2010 -0700 |
| tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 | |
| parent | cf6dd9bdefe12874e64ce6d139b4583264c528b2 [diff] | |
| parent | 6b4a87862eb5fdb58f4ada9fde976829e03ccc26 [diff] |
merge from open-source master Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd