commit | 5c8f92bedf1421dc3014d40dc4322f78505e1fdb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue May 18 12:47:02 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue May 18 12:47:02 2010 -0700 |
tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 | |
parent | 7074d8febb8a3812fbcebceeb52aa7f5df454776 [diff] | |
parent | 9addb68e3be6665b85915c979dbc832c5d36935b [diff] |
merge from open-source master Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4