am 91f7da13: am 458def94: am d473cf8f: Fix crash in TrampolineActivity
Makoto Onuki [Wed, 24 Jun 2015 20:35:41 +0000 (20:35 +0000)]
* commit '91f7da13a97aace49fe5bb556d3402847f599790':
  Fix crash in TrampolineActivity


Trivial merge