am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2

Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp

* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
  Add the example test to the CTS.
This commit is contained in:
Dan Bornstein 2009-11-17 16:35:22 -08:00 committed by Android Git Automerger
commit 39b99e4f59

View file

@ -70,6 +70,7 @@ CTS_CASE_LIST := \
CtsDatabaseTestCases \
CtsDpiTestCases \
CtsDpiTestCases2 \
CtsExampleTestCases \
CtsGestureTestCases \
CtsGraphicsTestCases \
CtsHardwareTestCases \