| commit | 8f7a0275f22e86c4436df1a64664865c24072c49 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Wed Nov 03 10:59:23 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 03 10:59:23 2010 -0700 |
| tree | 8c33b78bfe7f9e2e52cf9f53079ae2d21e61daf7 | |
| parent | a7bd8857383bb20d9a5589cd60752a842230131f [diff] | |
| parent | cf393faaa871333496a63c13196fdbc0f2bd9118 [diff] |
am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp * commit 'cf393faaa871333496a63c13196fdbc0f2bd9118': - Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.