tree c9cb6ec3176427944433e168a58669e21c078d68
parent babcb660760e7c85240e6bf43165c8c063d95715
parent 637a8d84bacd0b6973a16843259f0c11845f2cd2
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