am c8f42fb6: (-s ours) Merge "DO NOT MERGE: Remove auto connection on ACL...
am c8f42fb6: (-s ours) Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit 'c8f42fb6':
DO NOT MERGE: Remove auto connection on ACL connection.