Merge remote branch 'goog/honeycomb-mr2'
Conflicts:
apps/CtsVerifier/AndroidManifest.xml
apps/CtsVerifier/res/values/strings.xml
apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
tests/expectations/knownfailures-3.0_r1.txt
tests/expectations/knownfailures.txt
tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
tests/tests/os/src/android/os/cts/BuildVersionTest.java
tools/host/src/com/android/cts/Version.java
Change-Id: If9da4508f8eee25351538e3118e6ae990be49c60