Dianne Hackborn 4df142c4e9 am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 ...

* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
  SDK only: now that support lib is in SDK, we can link to it.

2011-12-12 18:09:54 -08:00

..

java

am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1

2011-12-12 18:09: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

am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

2011-12-12 11:06:33 -08:00

tests

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

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