Dianne Hackborn b5052de757 resolved conflicts for merge of a80bab37 to master ...

Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef

2011-12-13 16:31:43 -08:00

..

java

resolved conflicts for merge of a80bab37 to master

2011-12-13 16:31:43 -08:00

jni

TextLayoutCache - fix diacritics composition

2011-12-13 15:28:16 -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

Fix configured network status

2011-12-12 16:47:02 -08:00