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

Merge commit '762e331c2f302c508e5d28f22d0e537790458ef5'

* commit '762e331c2f302c508e5d28f22d0e537790458ef5':
  add test def for calculator