Jeff Brown 62007aba19 am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev ...

* commit '519e91ef84aab79d0e18ba72e8a133d2306b821c':
  Detect bad behavior earlier in Choreographer.

2012-06-12 12:43:01 -07:00

..

java

am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev

2012-06-12 12:43:01 -07:00

jni

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

2012-06-11 10:41:09 -07:00

res

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

2012-06-12 12:42:48 -07:00

tests

resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp

2012-06-08 13:47:46 -07:00