Michael Jurka 69cde42890 am b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1 ...

* commit 'b4529b0adca243644f601c9fe5d419c283bf57c1':
  HorizontalScrollView should delay child presses

2011-10-31 22:13:16 +00:00

..

java

am b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1

2011-10-31 22:13:16 +00:00

jni

resolved conflicts for merge of 2d280f75 to ics-mr1

2011-10-30 14:24:02 -07:00

res

am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0

2011-10-31 22:13:08 +00:00

tests

Interpret '+' as a space char in the URL query params.

2011-10-28 18:31:52 -04:00