Dianne Hackborn d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev ...

* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.

2012-06-12 13:00:47 -07:00

..

java

am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev

2012-06-12 13:00:47 -07:00

jni

am 3857681e: am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev

2012-06-11 10:44:52 -07:00

res

am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev

2012-06-12 13:00:33 -07:00

tests

am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp

2012-06-08 14:08:28 -07:00