Kenny Root 9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp ...

Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8

2012-10-19 17:16:41 -07:00

..

common_time

…

input

Recover from bad input event timestamps from the kernel.

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

java

resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:16:41 -07:00

jni

Fix a segfault when there is no power module.

2012-10-09 14:47:05 -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