Bart Sears ca55111f75 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 ...

* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.

2012-01-04 13:49:54 -08:00

..

java

am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1

2012-01-04 13:49:54 -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

Add a new ui mode for "appliance"

2011-12-14 20:59:30 -08:00

tests

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

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