| commit | bcf74accafcdac6c7a940ce28982fc0ef08e111b | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Sun Oct 10 12:51:00 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 10 12:51:00 2010 -0700 |
| tree | f093a5152dd151cf9e28c7d620e4e58e4a0140ce | |
| parent | 06dfa35e3c5f379b14d2acbc584c8d8cb2e822c7 [diff] | |
| parent | 9580b8ce6553ddde03db594fd4fd4f59ca61c382 [diff] |
am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382' * commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382': Update of DRM framework.