am 91f7da13: am 458def94: am d473cf8f: Fix crash in TrampolineActivity
authorMakoto Onuki <omakoto@google.com>
Wed, 24 Jun 2015 20:35:41 +0000 (20:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 20:35:41 +0000 (20:35 +0000)
commit8b2db225a6ccef9dff906ffed1e9c3193622f91d
tree4866c32d8b118b60d97883e599b96352812ee824
parent44ea38e5216c191c33d9b01aa8d21f584f75ba0a
parent91f7da13a97aace49fe5bb556d3402847f599790
am 91f7da13: am 458def94: am d473cf8f: Fix crash in TrampolineActivity

* commit '91f7da13a97aace49fe5bb556d3402847f599790':
  Fix crash in TrampolineActivity