diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-03 10:59:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-03 10:59:23 -0700 |
| commit | 8f7a0275f22e86c4436df1a64664865c24072c49 (patch) | |
| tree | 8c33b78bfe7f9e2e52cf9f53079ae2d21e61daf7 /libs/rs/rsg_ScriptJavaClass.cpp | |
| 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.
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions