am 259651e2: Merge "add test def for calculator" into gingerbread

Merge commit '259651e2de730b513003cb0c2f966f53b9dffb5e' into gingerbread-plus-aosp

* commit '259651e2de730b513003cb0c2f966f53b9dffb5e':
  add test def for calculator