OSDN Git Service

am f14dc291: Merge from ics-mr1
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 23:39:17 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:39:17 +0000 (15:39 -0800)
commit50a44951baf856cda679e78947e369ce923a6517
treeed289e8d756105114a04b35dbef3c027454f49f7
parentfec2284d520fa2856358692095a715678225abcb
parent2a82a3a8824904f4e6750eb18dcc33ed113edbeb
am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
drm/drmserver/DrmManager.cpp