tree c26e858d396b5b140ffa78cafefada6fc638b4b2
parent 7b2cae5072321da5d67f9d12dea10871326f3477
author Deepanshu Gupta <deepanshu@google.com> 1426113707 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1426114590 -0700

Fix rare NPE in BridgeContext.

Also fixed some deprecation warnings.

Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d