Jinsuk Kim c9cb91388b am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev ...

* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
  Maintain display power status for playback device

2014-04-03 01:41:13 +00:00

..

java

am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev

2014-04-03 01:41:13 +00:00

jni

resolved conflicts for merge of 71ab4f4f to master

2014-04-02 11:52:07 +01:00

res

Merge "Disable content transitions, they are not implemented yet"

2014-04-02 22:31:21 +00:00

tests

Expand install observer semantics

2014-03-27 12:37:47 -07:00