OSDN Git Service

am 7ba0f3c9: am 5a1d760b: Fix crash when exporting with null fx
authornicolasroard <nicolasroard@google.com>
Mon, 21 Oct 2013 23:33:47 +0000 (16:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Oct 2013 23:33:47 +0000 (16:33 -0700)
* commit '7ba0f3c9e79ef7c9fa16a9626b82aaa25347a4e1':
  Fix crash when exporting with null fx


Trivial merge