Jean-Baptiste Queru 9eb7a72253 resolved conflicts for merge of f7fb5331 to kraken ...

Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20

2010-05-17 13:50:32 -07:00

..

config

…

java

resolved conflicts for merge of f7fb5331 to kraken

2010-05-17 13:50:32 -07:00

jni

Get rid of warnings when compiled with -Wformat-security

2010-05-13 15:31:00 -07:00

res

am 9167ba50: merge from open-source master

2010-05-14 09:15:41 -07:00

tests

am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo

2010-05-13 16:05:54 -07:00