commit | bb1375f6bdc6cf7d8c3642367cf35565ddb094a8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 25 14:21:13 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 25 14:21:13 2010 -0700 |
tree | 53b232f8c3e714d0a6151b84ae635176f6c3a285 | |
parent | ca5e347ce4b2b51385c4b7395d51c30498c41a6b [diff] | |
parent | 9a2f5113fd1db1e1605daad47b16b6f960045582 [diff] |
am 9a2f5113: merge from open-source master Merge commit '9a2f5113fd1db1e1605daad47b16b6f960045582' * commit '9a2f5113fd1db1e1605daad47b16b6f960045582': Add timer delete support to rild