Dianne Hackborn bf2798b387 am 9ad66541: Merge "New ContentProvider initialization for testing." into jb-mr2-dev ...

* commit '9ad665417713398524d425f63b0d6fa751244237':
  New ContentProvider initialization for testing.

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

..

java

am 9ad66541: Merge "New ContentProvider initialization for testing." into jb-mr2-dev

2013-02-27 23:22:12 +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