commit | 2196172fb3cf3b1499449304fe37ec6e983da647 | [log] [tgz] |
---|---|---|
author | Eric Rowe <erowe@google.com> | Tue Oct 19 09:54:24 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 19 09:54:24 2010 -0700 |
tree | 01d1359a3be31beb124000693824974d0390b309 | |
parent | b2b91344e1d363d215b5cbb74d214668b52a4ced [diff] | |
parent | b7f0eeb2b0327e664a09ac67d3ef80498b7d4e95 [diff] |
am 86bf0c7b: (-s ours) am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread Merge commit '86bf0c7b69856124feb41fb1a938dce1f6695949' * commit '86bf0c7b69856124feb41fb1a938dce1f6695949': DO NOT MERGE Add additional options and receiver to BT tests