tree 3814c9c126a737f585d7debb890f4745bc632672
parent eb4a8d6850630b949cce51993673c981923226a2
parent 46f28d328a734fd1cfa0d8f17f15d5ed88508ae8
author Christopher Tate <ctate@google.com> 1280356718 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280356718 -0700

am bae6fe24: Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread

Merge commit 'bae6fe242ff9a97840ff0c5d9d87c0575d261682' into gingerbread-plus-aosp

* commit 'bae6fe242ff9a97840ff0c5d9d87c0575d261682':
  Support streaming of compressed assets > 1 megabyte