Merge "Signed-off-by: Woo-seok Jang <usok.jang@gmail.com>" into froyo