tree 4b3b1e267fe27d77e23e2052b9a8e813bc165d36
parent aac4bfb49b4706a21b7ae7318409d8c7e2de9917
parent 5e12aec16335dc3ae09d4cc8faa3e0deac5f2d31
author Eric Olsen <eolsen@android.com> 1269019613 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1269019613 -0700

Merge "Add the blacklist for the SCO connections"