tree b8497ded6aaf370feca2299360a4b12c867db928
parent 8cbc72c1e28f1b675d9d325e6a706d44377647ed
parent de7426d7e2c7362c3dd96f649d315b7c7bd99c6b
author Shailendra Yadav <shailendray@google.com> 1300149416 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300149416 -0700

am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1

* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
  Fix for Don't allow adding 64-bit files(4086708)