Merge "Fix ApiDemo for transitions" into klp-dev
diff --git a/samples/ApiDemos/res/transition/changebounds_fadein_together.xml b/samples/ApiDemos/res/transition/changebounds_fadein_together.xml
index c0bb26f..3a35653 100644
--- a/samples/ApiDemos/res/transition/changebounds_fadein_together.xml
+++ b/samples/ApiDemos/res/transition/changebounds_fadein_together.xml
@@ -13,11 +13,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
<changeBounds/>
<fade android:fadingMode="fade_in" >
<targets>
<target android:targetId="@id/grayscaleContainer" />
</targets>
</fade>
-</set>
+</transitionSet>
diff --git a/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml b/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml
index df36306..4734135 100644
--- a/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml
+++ b/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<!-- BEGIN_INCLUDE(TransitionSet) -->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
android:transitionOrdering="sequential">
<changeBounds/>
<fade android:fadingMode="fade_out" >
@@ -22,5 +22,5 @@
<target android:targetId="@id/grayscaleContainer" />
</targets>
</fade>
-</set>
+</transitionSet>
<!-- END_INCLUDE(TransitionSet) -->
