Robert Greenwalt 12bee3b3e2 am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 ...

* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.

2011-12-07 17:10:26 -08:00

..

java

am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

2011-12-07 17:10:26 -08:00

jni

am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1

2011-12-07 11:02:58 -08:00

res

am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1

2011-12-07 16:56:17 -08:00

tests

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

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