Justin Ho d5b9b26081 Resolve conflicts for merge 121e805a to master ...

Conflicts:
	CleanSpec.mk

Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676

2011-10-03 17:06:26 -07:00

..

etc

Add feature definition for Wi-Fi Direct

2011-09-07 11:51:48 -07:00

fonts

Correction the use of SMALLER_FONT_FOOTPRINT

2011-09-29 20:02:05 -07:00

keyboards

Update keymaps.

2011-08-10 14:43:20 -07:00

sounds

Adding additional variety to sound set 7

2011-10-03 16:06:09 -07:00

videos

Add third video to default system videos.

2011-09-15 18:08:01 -07:00