Adam Powell 72b7c53c92 am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev ...

* commit '015b2c1e0b9a9d0b3defb2958931b04386128590':
  Don't let ScrollView intercept touch events if it can't scroll.

2012-07-31 16:46:01 -07:00

..

java

am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev

2012-07-31 16:46:01 -07:00

jni

Merge "Fix Time.parse and Time.parse3339 crashing bugs."

2012-07-30 08:03:02 -07:00

res

Revert "am a21a6075: Reconcile with jb-mr1-release"

2012-07-31 10:58:38 -07:00

tests

am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev

2012-07-31 12:36:35 -07:00