tree 337bceb1933c6ba798171857b9e507271f17130b
parent d81e9f88f4576dd8b18143f0a0d5f50c3758202b
parent 43d406e5c633af505de0e05e44fda9cfe781c184
author Jean-Baptiste Queru <jbq@google.com> 1281971724 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281971724 -0700

am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"

Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp

* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
  add drm/ directory to include it as part of frameworks