tree 8f369f30d2ff5d39db2ceaca042f0bf917cb6df9
parent f16e4df61fb5482adffa1a541de985c48506ff28
parent 91a685f1eaa32cadb461755fb235239b308953c9
author Gloria Wang <gwang@google.com> 1295481553 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295481553 -0800

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

* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
  More fix for 64 bit offset.