tree 600bf5f27a9acd6615d9c4f80160ef7d0e37c447
parent 686c76d3823ec5488ee1497ca7663358e37ab93b
parent d5e77d5e56aa584e2bf21349f3d11918a15d594c
author Kenny Root <kroot@google.com> 1287005854 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287005854 -0700

am d5e77d5e: am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread

Merge commit 'd5e77d5e56aa584e2bf21349f3d11918a15d594c'

* commit 'd5e77d5e56aa584e2bf21349f3d11918a15d594c':
  Update OBB sample to revised API