am dc37b725: (-s ours) am 395cb95d: resolved conflicts for merge of 309f8b3f to ics-mr1

Browse Source

* commit 'dc37b7251c8edd3e73797c4d0e3acb6df192fb59':
  DO NOT MERGE Update CTS Version to 2.3_r10
  Add SKT/KT rule into CtsTelephonyTestCases and use MCC+MNC code to distinguish SKT or KT carriers.
  Fix AudioRecordTest to skip setUp() and tearDown() when MIC is not available.
  fix IPv6 loopback pattern
  Update the list UNSUPPORT_DATA_SMS_MESSAGES
  Adjust the value of individualStartTimeoutMs to be consistent with the value of testStatusTimeoutMs.
  Revert "Changed CTS runner to work with emulator"
  Disable CTS Verifier BT Connection Access Tests
  Fix Test Blacklist Mistake for HC MR2
  Update CTS Verifier Version to 3.1 R2
  Update CTS Version to 3.1 R5

...

This commit is contained in:

Brian Muramatsu

2011-11-18 15:22:39 -08:00

committed by Android Git Automerger

parent fff8fb1b9f 395cb95d6f

commit 46c9ffe1ea

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available