Victoria Lease af1653a851 resolved conflicts for merge of 6c18e2c8 to master ...

Change-Id: Idb4679247b201a1f453c63fee5b45b12b03a67a1

2013-04-17 10:33:23 -07:00

..

java

am 5bded3bf: am 8bba7510: Fix build - remove obsolete import of Animatable

2013-04-17 07:07:19 -07:00

jni

resolved conflicts for merge of 6c18e2c8 to master

2013-04-17 10:33:23 -07:00

res

am 46dedde9: am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev

2013-04-15 21:54:57 -07:00

tests

Make download manager tests more reliable.

2013-04-09 15:08:43 -07:00