Nick Kralevich 987f1e759c Merge "allowBackup doc fix." into jb-mr1-dev

2012-09-21 13:34:36 -07:00

..

java

Merge "Fix javadocs to fix build." into jb-mr1-dev

2012-09-21 13:01:58 -07:00

jni

Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev

2012-09-21 10:50:12 -07:00

res

Merge "allowBackup doc fix." into jb-mr1-dev

2012-09-21 13:34:36 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00