tree a7a9666e4d5da05f9a282dbf5c0ae1e875977e21
parent ced33f60e0d9fa82d6d7f521ea3a0d14b8296722
parent 04f79c7a5f46f6c2cf07a164ce352ab54dfe7f47
author Justin Klaassen <justinklaassen@google.com> 1404155334 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403887940 +0000

Merge "Rename CalculatorActivity back to Calculator"