Irfan Sheriff 5bc09e2683 Merge "Disable notification scans when p2p is connected" into jb-mr1-dev

2012-09-17 20:58:42 -07:00

..

java

Merge "Disable notification scans when p2p is connected" into jb-mr1-dev

2012-09-17 20:58:42 -07:00

jni

Fix occasional crash bug with layers

2012-09-17 11:21:34 -07:00

res

Merge "Disable notification scans when p2p is connected" into jb-mr1-dev

2012-09-17 20:58:42 -07:00

tests

Per-user content observer APIs

2012-09-17 16:35:36 -07:00