Justin Ho 954e51d16d am 882ed374: Resolved conflicts for merge of 83cf0313 to master ...

* commit '882ed3747145ca68b3acb26636be7a39755b5548':
  Ensuring previous sounds are named correctly Bug: 5416299

2011-10-10 16:49:28 -07:00

..

etc

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

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