commit | 07d814075583230e92f79d52845ecc3fa36df0fd | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 11 13:08:02 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 11 13:08:02 2010 -0700 |
tree | 8c56c545b408206bccb7e48d448cdd8be227cf77 | |
parent | a97d9594488c59b745a997afcd2682111977becd [diff] | |
parent | 4e916ad8c96fd7425e34ca1a8db82720fe046b73 [diff] |
merge from open-source master Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0