| commit | 507ac2ecfe044646f361ce4b0e9034b3d1094ef1 | [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 | 93fde667c67a7b62332fd0b0d678fff9f00dacf4 | |
| parent | 9c2e665bc92059b2f36273ee7bf3dc9e672ec39e [diff] | |
| parent | 6508ec903e7b6596a3b8167e3b18d0b966ea1b8f [diff] |
am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" * commit 'c35b3268919e6201f269eb9011ae184c5f613bc3': Initial OMA DRM forward lock contribution