Nick Kralevich c11f1198a4 am 987f1e75: Merge "allowBackup doc fix." into jb-mr1-dev ...

* commit '987f1e759c8f6c2a69d7973b472031f3210ff5cb':
  allowBackup doc fix.

2012-09-21 17:48:04 -07:00

..

java

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

2012-09-21 17:47:46 -07:00

jni

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

2012-09-21 17:46:55 -07:00

res

am 987f1e75: Merge "allowBackup doc fix." into jb-mr1-dev

2012-09-21 17:48:04 -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