Greg Hackmann 10df052c6a am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-dev ...

* commit 'f1bdbdd1bea9662f6731b7a366de1f602f43e5a9':
  Add timerfd backend to AlarmManagerService

2013-12-17 20:09:09 +00:00

..

common_time

…

input

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

2013-11-22 11:18:57 -08:00

java

am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-dev

2013-12-17 20:09:09 +00:00

jni

resolved conflicts for merge of 08579921 to klp-modular-dev

2013-12-17 11:56:22 -08:00

tests/servicestests

am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

2013-12-09 18:34:44 +00:00