Commits
Laurent Tu authored and Android Git Automerger committed aa3ac463c99M
am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev * commit 'dd549bcc29402198698865cf4fd9650d0e909d23': DO NOT MERGE Protect against NPE in FusionEngine.java.
Showing diff to2fb9b61a766