commit | 4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:35:57 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:35:57 2010 -0700 |
tree | 2c8bc654924c6810cab04d6f690703ceac7e534d | |
parent | 032ae72e19d9a12fff483664b975392ef63f2fb7 [diff] | |
parent | 72d89196dd920338253b39b0daac9c0f7d04b8a7 [diff] |
merge from open-source master Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6