Merge "Changed attribute name." into lmp-dev

This commit is contained in:
George Mount
2014-09-03 14:21:36 +00:00
committed by Android (Google) Code Review

View File

@@ -125,7 +125,7 @@
<item name="android:windowExitTransition">@transition/explode</item> <item name="android:windowExitTransition">@transition/explode</item>
<item name="android:windowSharedElementEnterTransition">@transition/move_image</item> <item name="android:windowSharedElementEnterTransition">@transition/move_image</item>
<item name="android:windowSharedElementExitTransition">@transition/move_image</item> <item name="android:windowSharedElementExitTransition">@transition/move_image</item>
<item name="android:windowAllowExitTransitionOverlap">true</item> <item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowAllowEnterTransitionOverlap">false</item> <item name="android:windowAllowEnterTransitionOverlap">false</item>
</style> </style>