tree 12f7fa7eca0deb60c0adbb8031eb756a01ab3f32
parent af0a15c820c0cdffcaf198e599cb55098510ad0a
parent 8b4ca7a1a9c8ea6f1cda126b1508226a580efafb
author Matthew Xie <mattx@google.com> 1337316595 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337316595 -0700

Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev