commit | ccfd99b1e2a64c72ec433ebf5cf98d644ab24614 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:39:38 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:39:38 2010 -0700 |
tree | 94ea23da21833dc40283d05a74621950d386662c | |
parent | 7d9526445c8631f347c7bf7d944e5bb1dc35b0b5 [diff] | |
parent | 24440cf8a9431291bdcaa77b418e6c4715932507 [diff] |
merge from open-source master Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5