Jeff Brown 5d359a9265 am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev ...

* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
  Remove clearUserActivityTimeout().

2012-10-01 11:39:30 -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

Bundle correlated switch changes atomically.

2012-09-27 21:42:57 -07:00

java

am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev

2012-10-01 11:39:30 -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