tree 682c47fc2ff116fe9006203a68f5be8a57f18532
parent c7ce941db433413234107d742281f1a8455431e2
parent e01e336efcd7d254e8441831981e9ecd20042e2a
author Chenjie Luo <cjluo@google.com> 1463604649 +0000
committer android-build-merger <android-build-merger@google.com> 1463604649 +0000

Merge "Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c am: dd0e3efd4d" into nyc-mr1-dev-plus-aosp
am: e01e336efc

* commit 'e01e336efcd7d254e8441831981e9ecd20042e2a':

Change-Id: I22ae08c295df61bd29b0e43b8376a093dbf5b0b4