AndroidCalculator
Merge github.com:cjtcwyk/Test