Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb