tree ef155c37a82c43a912f90b9142c9b87e78973258
parent fa3c665019ace11140b3c5677d02c9711fc4d86d
parent b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d
author Deepanshu Gupta <deepanshu@google.com> 1426120765 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426120765 +0000

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

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