Adam Powell f1a15060d0 am b2269d67: Merge "Revisions to ResolverActivity" into jb-dev ...

* commit 'b2269d67c4786037f93bff396eeb9ff7f003164a':
  Revisions to ResolverActivity

2012-05-06 17:57:11 -07:00

..

java

am b2269d67: Merge "Revisions to ResolverActivity" into jb-dev

2012-05-06 17:57:11 -07:00

jni

Merge "report a Sensor's version from the HAL" into jb-dev

2012-05-04 16:30:32 -07:00

res

Merge "Revisions to ResolverActivity" into jb-dev

2012-05-06 17:54:48 -07:00

tests

am 989c7532: Merge "fix expedited syncs. there were times when an expedited sync wouldn\'t correctly preempt non-expedited syncs" into jb-dev

2012-05-06 15:28:25 -07:00