commit | 7d10df4e2402c55dc827cb6675a15957071c00af | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 15 11:37:17 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 15 11:37:17 2010 -0700 |
tree | efabe5456438ce7de30403b38b60429acb5274cf | |
parent | 20374b6045fdce69d0d6b7f29e3bc3a445455698 [diff] | |
parent | 9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b [diff] |
merge from open-source master Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3