am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
This commit is contained in:
The Android Open Source Project 2011-12-12 15:39:17 -08:00 committed by Android Git Automerger
commit 61d9c58c85

Diff Content Not Available