diff options
author | Eric Rowe <erowe@google.com> | 2010-08-30 13:30:10 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 13:30:10 -0700 |
commit | 8e1bc8c5086ad4cc157483a8c7aa6172711bc0b5 (patch) | |
tree | 374aee23c106981f44221748ad1f0b65a3e4d324 /media/libeffects | |
parent | 3678668997f81f49ac52ec4441254e57f322d010 (diff) | |
parent | 6151a9ef232b9d4d2b38761159f49181679a6a17 (diff) | |
download | frameworks_base-8e1bc8c5086ad4cc157483a8c7aa6172711bc0b5.zip frameworks_base-8e1bc8c5086ad4cc157483a8c7aa6172711bc0b5.tar.gz frameworks_base-8e1bc8c5086ad4cc157483a8c7aa6172711bc0b5.tar.bz2 |
am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'
* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
DO NOT MERGE Add A2DP and Headset connection stress tests.
Diffstat (limited to 'media/libeffects')
0 files changed, 0 insertions, 0 deletions