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