merge from device/samsung/d2att