am 655fedbf: Merge "Check Only Settings Intent" into gingerbread

* commit '655fedbfd5387cb749fa32e3b41e867fe903304d':
  Check Only Settings Intent