The Android Open Source Project 575d1af980 resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07:00

..

config

Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE

2009-05-01 17:47:08 -07:00

java

resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07:00

jni

am b1a97523: Merge change 5739 into donut

2009-07-01 16:02:03 -07:00

res

am 8dd02090: Merge change 5940 into donut

2009-07-02 15:24:11 -07:00