Dianne Hackborn 30b07b50ef am 6f354ed9: Merge "Fix issue #7226101: Secure image capture takes 5 seconds to start" into jb-mr1-dev ...

* commit '6f354ed9994b4ea7612cc4499413de108dcac7d4':
  Fix issue #7226101: Secure image capture takes 5 seconds to start

2012-10-01 17:50:15 -07:00

..

common_time

am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."

2012-09-12 11:08:45 -07:00

input

New internal API to eliminate poke locks.

2012-10-01 14:27:34 -07:00

java

am 6f354ed9: Merge "Fix issue #7226101: Secure image capture takes 5 seconds to start" into jb-mr1-dev

2012-10-01 17:50:15 -07:00

jni

Merge "Pass display arg to blank/unblank" into jb-mr1-dev

2012-09-28 13:06:45 -07:00

tests/servicestests

am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev

2012-09-27 19:34:28 -07:00