commit all at 2014-12-28 22:37:49

Change-Id: I72742c518711b93a8f3c8b3d359ba074e708d46a
Signed-off-by: bailaobo <bailaobo@163.com>