commit | 742bc49505e33f42543a8d6ec8f4833e94b2ace8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 14 12:39:40 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 14 12:39:45 2010 -0700 |
tree | 6fe9f4b1c7d8ad16be0e1cb3ab99b1508f986cef | |
parent | 6150d112854f18a07884596ba43ea576ba2e8361 [diff] | |
parent | 1afe8aa78922d51f9d13d81eae86b86b0c11a2f5 [diff] |
merge from open-source master Change-Id: Iaa0381128dbfcbb6b7c7da072f0d78f02357fca9