Raph Levien d4bac5eab6 Merge "Remove SkFloatToScalar in GLES20Canvas (Minikin)"

2014-05-15 19:12:48 +00:00

..

java

Merge "Adding custom events to AccessibilityNodeInfo"

2014-05-15 17:51:46 +00:00

jni

Remove SkFloatToScalar in GLES20Canvas (Minikin)

2014-05-15 09:54:01 -07:00

res

am 8b2e7c4a: am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev

2014-05-15 17:23:55 +00:00

tests

Merge "Test multidex and annotations access."

2014-05-15 09:14:47 +00:00