tree 751e7b062b8c92b374c4005a0fd8b574d95f29e5
parent 45c001db40e91d1465682eb4b3843b01fe1d2eb9
parent e36c7112e7c48f3c8964f95a2a489d25504356b0
author Abodunrinwa Toki <toki@google.com> 1446566798 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446566798 +0000

Merge "Fix failing TextActivityTest."