| commit | 6508ec903e7b6596a3b8167e3b18d0b966ea1b8f | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Jan 13 12:38:29 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 13 12:38:29 2011 -0800 |
| tree | bd1100e370bfc582f36ff046b47a9371ad8cbab7 | |
| parent | 641f3f4778ed52c4225ced1eb3ee59cb3ee72a67 [diff] | |
| parent | 3ed11317ce695a413d337c60fde222f30306f092 [diff] |
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" * commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394': Initial OMA DRM forward lock contribution