Colin Cross 0ead2a00f4 am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes" ...

* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes

2014-06-17 22:53:09 +00:00

..

java

am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev

2014-06-17 19:26:48 +00:00

jni

am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"

2014-06-17 22:53:09 +00:00

res

am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint

2014-06-11 01:18:36 +00:00

tests

am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev

2014-05-20 09:26:18 +00:00