Craig Mautner d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev ...

* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done

2014-02-25 18:49:37 +00:00

..

java

am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev

2014-02-25 18:49:37 +00:00

jni

am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

2014-02-25 13:14:35 +00:00

res

am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev

2014-02-24 22:18:32 +00:00

tests

Move Json{Reader,Writer} test to cts.

2014-02-17 17:51:43 +00:00