commit b52b5dcd269cf6b6d0b8b2a09456db4c9091963d
author Brian Muramatsu <btmura@android.com> Fri Apr 29 15:10:45 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 29 15:10:45 2011 -0700
tree 0e6af9e81e43ae58052a8aee3aeee0227996b5ec
parent eee664823889ece5f20b388298222c25360f644b
parent 1a1d1f0194207776a088147002152bfb997c8063

am 1a1d1f01: am aabb29a8: am 28ed8256: am 0c0b54c7: Merge "Fix Broken Build" into gingerbread

* commit '1a1d1f0194207776a088147002152bfb997c8063':
  Fix Broken Build

apps/CtsVerifier/tests/src/com/android/cts/verifier/CtsVerifierActivityTest.java

diff --git a/apps/CtsVerifier/tests/src/com/android/cts/verifier/CtsVerifierActivityTest.java b/apps/CtsVerifier/tests/src/com/android/cts/verifier/CtsVerifierActivityTest.java
index c3e01b2..a7d5df5 100644
--- a/apps/CtsVerifier/tests/src/com/android/cts/verifier/CtsVerifierActivityTest.java
+++ b/apps/CtsVerifier/tests/src/com/android/cts/verifier/CtsVerifierActivityTest.java
@@ -44,7 +44,7 @@
         super.setUp();
         mActivity = getActivity();
         mInstrumentation = getInstrumentation();
-        mWelcomeTextView = (TextView) mActivity.findViewById(R.id.welcome);
+        mWelcomeTextView = (TextView) mActivity.findViewById(R.id.welcome_text);
         mWelcomeText = mActivity.getString(R.string.welcome_text);
         mContinueButton = (Button) mActivity.findViewById(R.id.continue_button);
         mContinueText = mActivity.getString(R.string.continue_button_text);