tree 03e07a447478edf4c444abbc7af3b8db719ec5a9
parent f186dafdfe60d77c526c4e087655e8b257bc45cd
parent 3e9bcb98c4190b18d113e79ead071a86cd7ca480
author John Huang <jsh@google.com> 1287507242 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287507242 -0700

am 3e9bcb98: am 382717f3: Merge "Set the thread pool size of NIST sip stack to one." into gingerbread

Merge commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480'

* commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480':
  Set the thread pool size of NIST sip stack to one.