am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Merge commit '836b4297ccde47ae6356b2a805394d3285368144' * commit '836b4297ccde47ae6356b2a805394d3285368144': DO NOT MERGE Add null check before disconnecting a device.
This commit is contained in: