| commit | a8984fe8cee1a6a1fdb5d64333675580ff2450fc | [log] [tgz] |
|---|---|---|
| author | Jesse Wilson <jessewilson@google.com> | Wed Apr 14 17:08:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 14 17:08:44 2010 -0700 |
| tree | 0aa9a8fc34f968d8696badc64d7181fdbb713172 | |
| parent | e09ba12220c2cbbe9d91514da4d0f8fd8543b239 [diff] | |
| parent | ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8 [diff] |
am ddc0d4c2: (-s ours) DO NOT MERGE. Suppressing tests that fail in CTS\' test runner. Merge commit 'ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8' into kraken * commit 'ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8': DO NOT MERGE. Suppressing tests that fail in CTS' test runner.