Laurent Tu e886adbda5 DO NOT MERGE Protect against NPE in FusionEngine.java.
Cherry-pick of Ic49a069eef47a62fb1e0c6f284a705a62c6ae232

Bug: 7629406
Change-Id: Ia04dba9496b02755678b43e12834e992f63ee45b
2012-12-04 16:15:24 -08:00
..