Gilles Debunne 2afcfa4239 resolved conflicts for merge of 5371a165 to master ...

Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7

2011-12-09 18:06:34 -08:00

..

java

resolved conflicts for merge of 5371a165 to master

2011-12-09 18:06:34 -08:00

jni

Clean TextLayout code and remove RTL_USE_HARFBUZZ

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

res

Merge "Edit to string to change "double-touch" to "double-tap" per standard language."

2011-12-09 16:42:11 -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