| commit | d6967377661aecb22b7a4a88d13fc9060f1694da | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue May 18 11:19:29 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 18 11:19:29 2010 -0700 |
| tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
| parent | a72c1e8e4de4efbce007bec89a952e78c751e0d6 [diff] | |
| parent | 7e4881eceec2dd1abbc2cec3b9f6c746af8f1e14 [diff] |
am 143c3d32: am 5ccb8b8c: merge from open-source master