Dianne Hackborn 6ccd2aff3e resolved conflicts for merge of 301b97ac to eclair ...

Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48

2009-08-27 12:26:44 -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 301b97ac to eclair

2009-08-27 12:26:44 -07:00

jni

Merge change 22520 into eclair

2009-08-25 12:07:53 -07:00

res

Add option to allow no-unlock-on-slider-open

2009-08-26 20:57:17 -07:00