Wink Saville 474c924379 Merge "resolved conflicts for merge of 99cd6671 to master"

2011-07-12 14:46:02 -07:00

..

java

Merge "Date/time pickers and calendar view not handling locale change."

2011-07-12 14:39:07 -07:00

jni

resolved conflicts for merge of 99cd6671 to master

2011-07-12 13:56:05 -07:00

res

Fix bugs around restoring submenu state after activity teardown/restore

2011-07-12 11:35:15 -07:00

tests

Merge "Fix Animator cancel() behavior"

2011-07-12 11:58:58 -07:00