| commit | c89d31932135dfc7786ede20cb4713f6f55e3f1a | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Jan 13 12:40:44 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 13 12:40:44 2011 -0800 |
| tree | 2bc185db5d7b284c2e06cd4cf1cb0d137ff2b32d | |
| parent | df989379943d40f2aa85e1200983accbb6c225ff [diff] | |
| parent | c35b3268919e6201f269eb9011ae184c5f613bc3 [diff] |
am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" * commit 'c35b3268919e6201f269eb9011ae184c5f613bc3': Initial OMA DRM forward lock contribution