Justin Ho 2d02019697 am d5b9b260: Resolve conflicts for merge 121e805a to master ...

* commit 'd5b9b26081b09ecd1a9701e3320bf969ae481f66':
  Adding additional variety to sound set 7

2011-10-03 17:09:28 -07:00

..

etc

am 1a58dce0: Merge "Add feature definition for Wi-Fi Direct"

2011-09-07 14:51:31 -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