tree e2fdc88934c74cb0a8043857a8819b6b867e5f09
parent b99997bb1fb5f07a6c12cc8fa06783631debe455
parent 0385ab598bb740af0e25b229404b27532b825a3c
author Elliott Hughes <enh@google.com> 1267669211 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267669211 -0800

am 042cc582: Merge "Don\'t call a method that can be overridden from File\'s constructors."

Merge commit '042cc58283c6a16db56fd758481388eee0f78619' into dalvik-dev

* commit '042cc58283c6a16db56fd758481388eee0f78619':
  Don't call a method that can be overridden from File's constructors.