OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fec2284 2a82a3a)
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)
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones

1  2 
drm/drmserver/DrmManager.cpp patch | diff1 | diff2 | blob | history

diff --cc drm/drmserver/DrmManager.cpp
Simple merge
frameworks/av
About OSDN
Find Software
Develop Software
Help