tree f0fe30e58399652523b050e047053d2bcf2ac9c1
parent c719603ee9560f38eba6686e922a365b8e6cbce2
parent 8743d1005f442d161d22feb0b495e67a2dc2f550
author The Android Open Source Project <initial-contribution@android.com> 1364325468 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364325468 -0700

am 8743d100: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '8743d1005f442d161d22feb0b495e67a2dc2f550':
  WAR for compiler crash on PhaseBeam.