tree 495f0a2e19c60aeda05111045842c0ffa71be9ff
parent 746db9cfbf8102d1daa59a181789be36ccf410fd
parent 49d3c36134f818e06dc6c71d462ee8369c73c195
author Deepanshu Gupta <deepanshu@google.com> 1426122219 +0000
committer android-build-merger <android-build-merger@google.com> 1426122219 +0000

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

* commit '49d3c36134f818e06dc6c71d462ee8369c73c195':
  Fix rare NPE in BridgeContext.