Dianne Hackborn 846df9f517 resolved conflicts for merge of 8952a448 to master ...

Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b

2010-09-23 20:33:19 -07:00

..

config

…

java

resolved conflicts for merge of 8952a448 to master

2010-09-23 20:33:19 -07:00

jni

Merge "Add Wifi Protected Setup support"

2010-09-23 11:33:49 -07:00

res

Add new WaveView widget to framework and integrate into LockScreen.

2010-09-23 17:14:48 -07:00

tests

am 2b1ffce1: am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread

2010-09-23 14:34:55 -07:00