Jim Miller 5d3f859959 Merge multi-user stuff from prototype into framework. ...

Change-Id: I195b588ecfcea3388a2489fe7278a851202380c6

2012-10-22 20:45:56 -07:00

..

java

Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev

2012-10-22 17:53:27 -07:00

jni

Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev

2012-10-22 15:46:43 -07:00

res

Merge multi-user stuff from prototype into framework.

2012-10-22 20:45:56 -07:00

tests

Robustly add symlink and add for non-primary users

2012-10-18 15:12:09 -07:00