xiaodongwang 4ca08e44e7 merge new change to master ...

Change-Id: I566f0183532979e53af75b56ac89a9f25ff6c1ad

2014-11-03 17:32:27 -08:00

..

default

merge new change to master

2014-11-03 17:32:27 -08:00