Chris Craik d9155605ab am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-dev ...

* commit 'aa9972943cab627db9b10e5c9c4bb80f99f8a4bd':
  Revert "Add temporary functor lifetime logging"

2012-05-09 01:48:04 -07:00

..

java

am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-dev

2012-05-09 01:48:04 -07:00

jni

Don't call into power HAL if it isn't loaded.

2012-05-08 12:18:38 -07:00

res

Merge "Fix some oddities in ResolverActivity" into jb-dev

2012-05-08 11:27:27 -07:00

tests

am 29bb27ef: Merge "Add encryption parameters to package installation" into jb-dev

2012-05-09 01:45:43 -07:00