tree f6690821acfed0e3c10e34c0e8b1354a987122df
parent 72b228f6b18763a95023fd8ba44eb7354cfd7f74
parent 13e05b3f569965d97ec7d7f65e4cd46c6a22c23d
author Gloria Wang <gwang@google.com> 1294945911 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294945911 -0800

am a220a297: Merge "Initial OMA DRM forward lock contribution"

* commit 'a220a2979937700024662be0f8fc166ca65506ed':
  Initial OMA DRM forward lock contribution