am 9725fac3: Merge change I9cdaba5e into eclair

Merge commit '9725fac3df5e4ef3bf7d49d9b0ee0bb4acbc7379' into eclair-plus-aosp

* commit '9725fac3df5e4ef3bf7d49d9b0ee0bb4acbc7379':
  New assets for settings