Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp * commit '5b930c49b12bdb1461a18491db768c642c38d498': SIP: add config flag for wifi-only configuration.
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp * commit '5b930c49b12bdb1461a18491db768c642c38d498': SIP: add config flag for wifi-only configuration.