Alan Viverette ae1248452a am f805b40c: Merge changes Ia2bf4d17,I8242523d ...

* commit 'f805b40c44769a751d10d404e8ea778a23d5a51a':
  Fix alert dialog alignment and touch feedback masking
  Fix VectorDrawable states

2014-04-17 18:19:51 +00:00

..

java

am 99d2ffa1: Merge "Split Activity Transitions out of PhoneWindow."

2014-04-17 18:13:30 +00:00

jni

Merge "Call SkShader::isOpaque() to determine opaqueness."

2014-04-17 17:25:22 +00:00

res

am f805b40c: Merge changes Ia2bf4d17,I8242523d

2014-04-17 18:19:51 +00:00

tests

Class for managing the active scorer application.

2014-04-16 14:17:01 -07:00