OSDN Git Service

am 9a2f5113: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 25 Jun 2010 21:21:13 +0000 (14:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Jun 2010 21:21:13 +0000 (14:21 -0700)
commitbb1375f6bdc6cf7d8c3642367cf35565ddb094a8
tree53b232f8c3e714d0a6151b84ae635176f6c3a285
parentca5e347ce4b2b51385c4b7395d51c30498c41a6b
parent9a2f5113fd1db1e1605daad47b16b6f960045582
am 9a2f5113: merge from open-source master

Merge commit '9a2f5113fd1db1e1605daad47b16b6f960045582'

* commit '9a2f5113fd1db1e1605daad47b16b6f960045582':
  Add timer delete support to rild
include/telephony/ril.h
libril/ril.cpp