am d473cf8f: Fix crash in TrampolineActivity
Makoto Onuki [Wed, 24 Jun 2015 20:08:57 +0000 (20:08 +0000)]
* commit 'd473cf8f85f60d53b20270a263afe6b138671cb5':
  Fix crash in TrampolineActivity


Trivial merge