| commit | fb7b3918e198fabc6529f6293f9c4fa95049ddf9 | [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 | 0cb98f4a140191ed56ffbdb595221945fade125b | |
| parent | 3f1072eb3490feaa5cd3162cd695bca9be7bc62a [diff] | |
| parent | 9bc44ea84f1ce1bbe2c6d2004f05524784ca2636 [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.