merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-  android:duration="2000"
+  android:duration="1000"
  android:fromAlpha="1.0"
  android:interpolator="@android:anim/linear_interpolator"
  android:toAlpha="0.0" />