| commit | b96164ca098dd81bac22e4d4629e2297afb8f4f4 | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Wed Jan 12 20:51:16 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 12 20:51:16 2011 -0800 |
| tree | 0b9295b6c099b54103a67256e629cbe9385fd61e | |
| parent | 5ee164d20434d5e1ef3f918d077d612929d1fb5c [diff] | |
| parent | f683a357ee74f1bdd14ebdbac83c10d472386d71 [diff] |
am f683a357: (-s ours) am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread * commit 'f683a357ee74f1bdd14ebdbac83c10d472386d71': DO NOT MERGE: Remove auto connection on ACL connection.