Change-Id: Id2a741b665d002f68eb2686999ca4619dac05d2c
IMC

Change-Id: I3f57ae5a312f02375c7500bd95e26a15fd433a44
Merge branch 'master' of https://github.com/uilian/Android_Test.git