Romain Guy d88e0680ed am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw. ...

Merge commit '288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp

* commit '288471d8a57e1c318742cbfc28697877436fdb87':
  DO NOT MERGE. Load assets in place instead of deferring until draw.

2010-08-19 15:06:50 -07:00

..

config

…

java

am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread

2010-08-19 09:11:31 -07:00

jni

DO NOT MERGE. Load assets in place instead of deferring until draw.

2010-08-19 15:02:31 -07:00

res

am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"

2010-08-17 07:48:50 -07:00

tests

am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread

2010-08-18 13:35:47 -07:00