Romain Guy 9a5c6e4f56 am 18ef3725: DO NOT MERGE. Fix the build. ...

Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp

* commit '18ef37258d897928c68b89535a93b99d8a817d3c':
  DO NOT MERGE. Fix the build.

2010-08-19 15:18:34 -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. Fix the build.

2010-08-19 15:15:19 -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