am 3d5c990b: Reconcile with gingerbread-release gingerbread-mr4-release

* commit '3d5c990b63678d2152481a31c58c9a0934a34540':
  DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
  DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
This commit is contained in:
Jean-Baptiste Queru
2011-09-09 09:07:32 -07:00
committed by Android Git Automerger

Diff Content Not Available