Justin Ho 882ed37471 Resolved conflicts for merge of 83cf0313 to master ...

Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344

2011-10-10 16:46:35 -07:00

..

etc

Add feature definition for Wi-Fi Direct

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

fonts

Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf

2011-10-06 16:00:58 -07:00

keyboards

Update keymaps.

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

sounds

Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-factoryrom

2011-10-10 16:34:23 -07:00

videos

Add third video to default system videos.

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