am 3a2b9035: Merge "Add Debug Settings Activity" into gingerbread

Merge commit '3a2b90357ce056765d5c9d6dec0335c308e21717' into gingerbread-plus-aosp

* commit '3a2b90357ce056765d5c9d6dec0335c308e21717':
  Add Debug Settings Activity