| commit | 1dac4cdd6faba15426a0b37a7a615c04f5a35394 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Jan 13 11:11:51 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 13 11:11:51 2011 -0800 |
| tree | 66ed2a6492c5d707f198fa47f0cc70fb7f3d586b | |
| parent | c506ab89505f7adf5411f2418e48ea67acf03700 [diff] | |
| parent | a220a2979937700024662be0f8fc166ca65506ed [diff] |
am a220a297: Merge "Initial OMA DRM forward lock contribution" * commit 'a220a2979937700024662be0f8fc166ca65506ed': Initial OMA DRM forward lock contribution