| commit | a0a52e3265b0177a0ac0bd243e5756db18cd613d | [log] [tgz] |
|---|---|---|
| author | Laurent Tu <laurentt@google.com> | Wed Dec 05 12:28:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 12:28:47 2012 -0800 |
| tree | 8025d0f80401065d9bb0e5e1b7f00e382b9f402b | |
| parent | b34e1ca709860f8e585caaca1583b0a711863454 [diff] | |
| parent | 87830ae7714ff31b77850d5bca71a19ee1ce4d7f [diff] |
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.