Jim Miller 022554e3da Merge latest prototype changes into keyguard ...

- multi-user avatar stuff.
- new SlidingChallengeLayout changes.

Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25

2012-10-22 19:06:05 -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 latest prototype changes into keyguard

2012-10-22 19:06:05 -07:00

tests

Robustly add symlink and add for non-primary users

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