| commit | bf3122eed31cd24acdf5cfd25541db0beb77e6f0 | [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 | e7e04122e2c20cc9dfdc9d769239a37cce46f818 | |
| parent | 23e1202062a79cab313908891d91863742153df5 [diff] | |
| parent | 606649635ecb5a7f1378f2538a25fee64214ff42 [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.