Christopher Tate c93af316e8 am a8eb5071: am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev ...

* commit 'a8eb5071d20b8b9aac924753c997f28c7e9dcbb0':
  Support different watchdog timeouts for different entities

2013-10-24 14:00:45 -07:00

..

common_time

…

input

Merge "Utilize new Android LED constants"

2013-10-22 01:26:45 +00:00

java

am a8eb5071: am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev

2013-10-24 14:00:45 -07:00

jni

Private flags are masked in correct variable

2013-10-02 16:18:55 -07:00

tests/servicestests

resolved conflicts for merge of 94b51810 to master

2013-10-14 10:39:41 -07:00