Revert "remove un-needed line"

This reverts commit e8d1c4fa3009358028f947ef34b771e057ad4866.

	modified:   core/java/android/app/ActivityThread.java
Revert "Revert "remove un-needed line""

This reverts commit 305e59b544ae527d7b2c6eb4348b45f441d353f8.

	modified:   core/java/android/app/ActivityThread.java
One more fix for attr handling in ResourceSet/Merger.

attr that are defined outside of the styleable should be
properly handled (and tested).

Change-Id: Iadad5e7efee9297c2935ca7d08cce1965b0bf8a0

Conflicts:
	common/src/main/java/com/android/SdkConstants.java
	sdk-common/src/main/java/com/android/ide/common/res2/AssetSet.java
	sdk-common/src/main/java/com/android/ide/common/res2/DataSet.java
	sdk-common/src/main/java/com/android/ide/common/res2/ResourceSet.java
	sdk-common/src/main/java/com/android/ide/common/res2/ValueResourceParser2.java
	sdk-common/src/test/java/com/android/ide/common/res2/ResourceMergerTest.java
	sdk-common/src/test/java/com/android/ide/common/res2/ResourceRepositoryTest.java
	sdk-common/src/test/java/com/android/ide/common/res2/ResourceSetTest.java
	sdk-common/src/test/java/com/android/ide/common/res2/ValueResourceParser2Test.java
	sdk-common/src/test/resources/testData/resources/baseSet/values/values.xml

	new file:   common/src/main/java/com/android/SdkConstants.java
	new file:   sdk-common/src/main/java/com/android/ide/common/res2/AssetSet.java
	new file:   sdk-common/src/main/java/com/android/ide/common/res2/DataSet.java
	new file:   sdk-common/src/main/java/com/android/ide/common/res2/ResourceSet.java
	new file:   sdk-common/src/main/java/com/android/ide/common/res2/ValueResourceParser2.java
	new file:   sdk-common/src/test/java/com/android/ide/common/res2/ResourceMergerTest.java
	new file:   sdk-common/src/test/java/com/android/ide/common/res2/ResourceRepositoryTest.java
	new file:   sdk-common/src/test/java/com/android/ide/common/res2/ResourceSetTest.java
	new file:   sdk-common/src/test/java/com/android/ide/common/res2/ValueResourceParser2Test.java
	new file:   sdk-common/src/test/resources/testData/resources/baseSet/values/values.xml
	new file:   sdk-common/src/test/resources/testData/resources/brokenSet3/values/values.xml
Revert "remove un-needed line"
This reverts commit e8d1c4fa3009358028f947ef34b771e057ad4866.

	modified:   core/java/android/app/ActivityThread.java
Merge branch 'temp'
Revert "Revert "Merge "Track libcore API change."""

This reverts commit 6a4bed36516ad7e39d2bb25e9f80899ff89711b2.

	modified:   api/current.txt