kindle fire specific code
formatting cleanup
synchronization with ice-cream-sandwich branch
members re-ordering