diff options
| author | Brett Chabot <brettchabot@android.com> | 2009-11-02 17:15:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-02 17:15:02 -0800 |
| commit | 4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7 (patch) | |
| tree | 74c6f1d02006f8d2a4be3f4e04d96490b38652cd /media/tests | |
| parent | b580d53e7517e6020ee42c4f0fcda21bf381c74e (diff) | |
| parent | d6af2e0cbf144b091d9c9d1bf2f3061547220c80 (diff) | |
| download | frameworks_base-4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7.zip frameworks_base-4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7.tar.gz frameworks_base-4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7.tar.bz2 | |
am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-mr2
* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
Suppress takePicture test from continuous DO NOT MERGE.
Diffstat (limited to 'media/tests')
0 files changed, 0 insertions, 0 deletions