Ben Murdoch 9b4f09348e am 0e2f22a4: Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev ...

* commit '0e2f22a42bc91db814591164b8a2cfc3d5a5cdbc':
  Update WebView#PictureListener for JBMR2.

2013-02-27 23:22:31 +00:00

..

java

am 0e2f22a4: Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev

2013-02-27 23:22:31 +00:00

jni

Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev

2013-02-26 01:36:05 +00:00

res

Import translations. DO NOT MERGE

2013-02-27 09:13:55 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00