Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d
tree: 7111485236552775712f36a80e6762fcc6f4c644
  1. default.xml