tree 5328a4619925d2476cebdc614e175f9c29391181
parent cfed1b5222d6889312cfa8b7226fb07effd06297
parent fceec0e124a55b25d59f2af5279c70ac045d6771
author Deepanshu Gupta <deepanshu@google.com> 1426228369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426228369 +0000

am fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'fceec0e124a55b25d59f2af5279c70ac045d6771':
  Fix rare NPE in BridgeContext.