| commit | fd9abb8086bf98d453d01cca95c54e93e46e17e7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 03 16:26:53 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 03 16:26:53 2010 -0700 |
| tree | ed855078c90054b870b6effb1b1ea9f82f1fb200 | |
| parent | 996694e2f0a9625faec3979f6a9b2bc450db7fcd [diff] | |
| parent | 439dcb36ed2ce1c485b2c13a5c1ca4b120e18924 [diff] |
am dcb5f18f: am 007ad770: merge from open-source master