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

* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
  Maintain display power status for playback device

2014-04-03 01:44:59 +00:00

..

java

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

2014-04-03 01:44:59 +00:00

jni

resolved conflicts for merge of 71ab4f4f to master

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

res

am 09ec3e30: Merge "Disable content transitions, they are not implemented yet"

2014-04-02 22:37:50 +00:00

tests

Expand install observer semantics

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