commit | 9a2f5113fd1db1e1605daad47b16b6f960045582 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 22 14:18:59 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 22 14:18:59 2010 -0700 |
tree | 4db4ad2ba58cd8b70755f8b6d00e9b2f448487e9 | |
parent | dc5045360b73de2f4ebba0e212b426e31e59ec06 [diff] | |
parent | 7edd07c9184a3abfaa3f4a161b74b3da9d7bbd56 [diff] |
merge from open-source master Change-Id: I0628d21b4bf629896dad7b9b5b6a9357021e1278