Gilles Debunne 7cb77c1a0d resolved conflicts for merge of 1742f20c to master ...

Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555

2011-12-12 15:16:42 -08:00

..

java

resolved conflicts for merge of 1742f20c to master

2011-12-12 15:16:42 -08:00

jni

Clean TextLayout code and remove RTL_USE_HARFBUZZ

2011-12-08 15:16:17 -08:00

res

am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1

2011-12-12 12:35:09 -08:00

tests

am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 16:32:59 -08:00