tree 8025d0f80401065d9bb0e5e1b7f00e382b9f402b
parent b34e1ca709860f8e585caaca1583b0a711863454
parent 87830ae7714ff31b77850d5bca71a19ee1ce4d7f
author Laurent Tu <laurentt@google.com> 1354739327 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354739327 -0800

am 87830ae7: (-s ours) am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev

* commit '87830ae7714ff31b77850d5bca71a19ee1ce4d7f':
  DO NOT MERGE Protect against NPE in FusionEngine.java.