Jake Hamby c40f70a5cb Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1

2011-12-08 15:51:33 -08:00

..

java

Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1

2011-12-08 12:28:11 -08:00

jni

Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)

2011-12-06 15:31:19 -08:00

res

Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.

2011-12-08 15:33:32 -08:00

tests

Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 15:52:34 -08:00