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

Merge commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3'

* commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3':
  Add the example test to the CTS.
This commit is contained in:
Dan Bornstein 2009-11-17 16:38:57 -08:00 committed by Android Git Automerger
commit 58226c0825

View file

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