tree c4a1ffa6147bbaad44f0c4fc97f8f4eeb1ec2533
parent 48db44822cb9b458c91ccc48352d72891cf6a3a7
parent ad049424855638936fd6064850088c710f41372d
author Vinit Deshpande <vinitd@google.com> 1426452270 -0700
committer Vinit Deshpande <vinitd@google.com> 1426452270 -0700

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

merged from goog/mirror-m-wireless-internal-release
ad04942 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge: 49d3c36