tree ac1102aea6b6fc44894d1bbc2f24dfc07cba552f
parent 437455fed5ef2ca8e718ce58f4a2c201a7742c73
parent 758753c876c4f383edf4c4b49a32042ab5a12656
author Kenny Root <kroot@google.com> 1286843466 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286843466 -0700

am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread

Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous