| commit | 204e82d0af26ab08e3bf8f82e676edcc7b992931 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 17 15:03:01 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 17 15:03:01 2010 -0700 |
| tree | ef19bc1fbc20b2d184b4d73ded69980e7e0fef7e | |
| parent | ac65d2f600a829ca6bf0385352c1900fcc4d0698 [diff] | |
| parent | 8e1ee7fd01986825074ececd39e8c2a5ebc907e0 [diff] |
am 8e1ee7fd: merge from open-source master