am 5ae52f68: (-s ours) am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread

Merge commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267'

* commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267':
  Add new/changed drawable assets from design team