Adam Powell 4ffd4b884b am 97621027: Merge "Limit item heights in split action bars" into jb-dev ...

* commit '9762102794b90d40d69a9a31aa8cd1538f8151f8':
  Limit item heights in split action bars

2012-05-06 20:07:07 -07:00

..

java

am 97621027: Merge "Limit item heights in split action bars" into jb-dev

2012-05-06 20:07:07 -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 "Fix typo." into jb-dev

2012-05-06 18:07:19 -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