tree 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
parent b44a3c97146d1edae7bc2bfa7cdbaf107e4ca746
parent 7d7daee5faf56c1c4c6e9d514e9dcc6c316397e3
author Chung-yih Wang <cywang@google.com> 1286512629 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286512629 -0700

am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread

Merge commit '44b7ef5408f135892fe8e8643fa4946532902672' into gingerbread-plus-aosp

* commit '44b7ef5408f135892fe8e8643fa4946532902672':
  SipService: add permission check for using API