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)
commit61d9c58c85947139398f1ba22e6c0ddfaf3793ac
tree8cef08e323746a2ae01800c70e083ad67d7fcb9a
parent313a4b4d1d00f29e37838d46a963220759789b1c
parent02f2cff12c26faca7e834af7b6003a766fc84f05
am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones