am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"

* commit '6fb425e2805a1c27c048fc954d402f4612cbf74d':
  Settings: Use ICS alert drawable