tree 405625778609c9d65ff20fb3571227867100f16f
parent 62c64c48f8ae8142b893b20cf08fab2cb2a1d69f
parent 5cc52d46226bf1ab6faa8910413153c0b86dc5c9
author Gloria Wang <gwang@google.com> 1295481694 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295481694 -0800

am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
  More fix for 64 bit offset.