tree 12dcb02cd32609d830b7541723ac8d18dd679fa3
parent 136d8336b6cb18067cd783185dacef34ae785519
parent ac9717ab73afe0123b6dbb63c4dd2fc88143e53e
author Kenny Root <kroot@google.com> 1281561018 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281561018 -0700

am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread

Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService