Danielle Millett d712248e4e am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 ...

* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
  DO NOT MERGE - Cherry picking from master to MR1

2012-01-12 07:31:36 -08:00

..

java

am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1

2012-01-12 07:31:36 -08:00

jni

am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1

2012-01-06 14:21:12 -08:00

res

am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1

2012-01-12 06:36:02 -08:00

tests

Remove sleep from test acitivity to avoid ANR when key event is injected

2011-12-19 17:20:04 -08:00