tree c3044774c9ea8c919fbd492266878eb109c6bb8a
parent 6a3eddb469b282f7d904e5dbcb375ad44ada3ee3
parent 2942391801b79816c5eb77d7ac94c4a65f26af48
author Kenny Root <kroot@google.com> 1285948553 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285948553 -0700

am 29423918: Fix regression in OBB key handling

Merge commit '2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp

* commit '2942391801b79816c5eb77d7ac94c4a65f26af48':
  Fix regression in OBB key handling