am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread

* commit '9fe36302703f25f4b2798770a6aa0080ade8deb4':
  DO NOT MERGE Fix crash when device is null in Connection Access Cancel.