Craig Mautner 337aa27a63 am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev ...

* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
  Adds showWhenLocked attribute to Activities.

2012-10-07 11:53:43 -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

Recover from bad input event timestamps from the kernel.

2012-10-05 19:33:28 -07:00

java

am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev

2012-10-07 11:53:43 -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