Merge pull request #4279 from t-nelson/droid_passthrough_fix
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Wed, 26 Feb 2014 03:27:53 +0000 (22:27 -0500)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Wed, 26 Feb 2014 03:27:53 +0000 (22:27 -0500)
[DROID][AE] Don't crash on passthrough.


Trivial merge