| commit | c35b3268919e6201f269eb9011ae184c5f613bc3 | [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 | ae8efb7988e8bd0e3a3fc4690697b20816cbb37c | |
| parent | 85ffbe6b029e315d5d53cadcc04b2af4c38aef3a [diff] | |
| parent | 1dac4cdd6faba15426a0b37a7a615c04f5a35394 [diff] |
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" * commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394': Initial OMA DRM forward lock contribution