commit | 1a4ab4aa0e09c3873733b53c130bd15afe3e6d06 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 14 14:18:32 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 14 14:18:32 2010 -0700 |
tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 | |
parent | 5c4c784bd7f5e7c678ac6d8312f11f65b9be7003 [diff] | |
parent | 8216ca8aa0df70012de8b9d0524c5a0ee182cdde [diff] |
merge from open-source master Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95