tree 69f33d22b47959c9522cfef749a5057131aa68f9
parent 1cadc482b79166b938f395e5676bd5d14d897aac
parent 95fafca8d5395d414c62a4135eed7f98dd54ab33
author Kenny Root <kroot@google.com> 1285949254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285949254 -0700

am 637a8d84: am 29423918: Fix regression in OBB key handling

Merge commit '637a8d84bacd0b6973a16843259f0c11845f2cd2'

* commit '637a8d84bacd0b6973a16843259f0c11845f2cd2':
  Fix regression in OBB key handling