John Spurlock 86b6357e5e Manual f/b merge of lockhotness camera integration. ...

Change-Id: I5c7c3c49e13656e9ba4a3761be7d503642d5b76f

2012-10-24 13:30:02 -04:00

..

java

Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev

2012-10-23 21:54:42 -07:00

jni

Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

2012-10-23 15:22:37 -07:00

res

Manual f/b merge of lockhotness camera integration.

2012-10-24 13:30:02 -04:00

tests

Robustly add symlink and add for non-primary users

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