Dianne Hackborn 9b081a809a resolved conflicts for merge of 8b625a95 to master ...

Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba

2010-05-18 18:21:07 -07:00

..

config

…

java

resolved conflicts for merge of 8b625a95 to master

2010-05-18 18:21:07 -07:00

jni

am c5fdcaa2: am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken

2010-05-13 15:39:02 -07:00

res

am 9c75fa72: am 0b275423: am 8ea405d1: am cfa2de30: Import revised translations

2010-05-17 14:59:03 -07:00

tests

am 8ee6aefe: am 58e49a50: Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken

2010-05-17 16:45:20 -07:00