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