am f5a36645: Merge "Test for Settings Intents" into gingerbread

* commit 'f5a36645c1ed3cb3087f76d9cbb20f6271ead68f':
  Test for Settings Intents