Merge pull request #1 from xaatw0/annotationtest

Change-Id: I7609e114c42b818b040ac51ad134d82b6116fa56
Merge pull request #2 from xaatw0/master

AOP完成