am b07d14c2: am 8321bdf4: Merge change I95529db1 into eclair

Merge commit 'b07d14c26ef33b8aa94a815273d6cb2caac180f5' into eclair-mr2-plus-aosp

* commit 'b07d14c26ef33b8aa94a815273d6cb2caac180f5':
  Add Free Flight ringtone to source tree.