Julia Reynolds 3370e446b1 Merge "Store the device initializer componentname in addition to package."

2015-04-03 14:30:18 +00:00

..

java

Merge "Store the device initializer componentname in addition to package."

2015-04-03 14:30:18 +00:00

jni

Merge "Add Paint.hasGlyph method"

2015-04-02 23:27:24 +00:00

res

Merge "Revert "Revert "Use AVD for checkbox animation."""

2015-04-02 22:59:18 +00:00

tests

resolved conflicts for merge of 261e7a37 to master

2015-04-01 18:23:27 -07:00