tree dd1c4e52cec50c8aa4269ff508b7561bb74ec42e
parent 62349321d46007285d6a30d644a57b949068e579
parent 7ba0f3c9e79ef7c9fa16a9626b82aaa25347a4e1
author nicolasroard <nicolasroard@google.com> 1382398427 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382398427 -0700

am 7ba0f3c9: am 5a1d760b: Fix crash when exporting with null fx

* commit '7ba0f3c9e79ef7c9fa16a9626b82aaa25347a4e1':
  Fix crash when exporting with null fx